semver 和 publish 的调整

models/package.js

@@ -43,7 +43,12 @@ Package.prototype = {
   },
 
   delete: function() {
-    fs.removeSync(path.join(CONFIG.wwwroot, 'repository', this.name, this.version));
+    var now = moment().format('YYYY-MM-DDTHH:mm:ssZ');
+    this['unpublished'] = {
+      time: now
+    };
+    fs.outputJsonSync(this.datafile(), this);
+    fs.removeSync(path.join(CONFIG.wwwroot, 'repository', this.name, this.version, this.filename));
     return this;
   }
 };

models/project.js

@@ -38,7 +38,12 @@ Project.prototype = {
     this.getVersions().forEach(function(version) {
       that.remove(version);
     });
-    fs.removeSync(path.join(CONFIG.wwwroot, 'repository', this.name));
+
+    var now = moment().format('YYYY-MM-DDTHH:mm:ssZ');
+    this['unpublished'] = {
+      time: now
+    };
+    fs.outputJsonSync(this.datafile(), this);
     return this;
   },
 

routes/index.js

@@ -9,6 +9,7 @@ var fs = require('fs');
 var path = require('path');
 var request = require('request');
 var elastical = require('elastical');
+var semver = require('semver');
 var client = new elastical.Client();
 var badge = require('../lib/badge');
 var anonymous = CONFIG.authorize.type === 'anonymous';
@@ -153,7 +154,11 @@ exports.project = function(req, res, next) {
 
 exports.package = function(req, res, next) {
   var name = req.params.name;
-  var version = req.params.version;
+  var project = new Project({
+    name: req.params.name
+  });
+  var version = semver.maxSatisfying(Object.keys(project.packages), req.params.version);
+
   var p = new Package({
     name: name,
     version: version

routes/repository.js

@@ -5,6 +5,7 @@ var fs = require('fs-extra');
 var path = require('path');
 var tempfile = require('tempfile');
 var tar = require('tarball-extract');
+var semver = require('semver');
 var hook = require('../lib/hook');
 var history = require('../lib/history');
 var elastical = require('elastical');
@@ -68,9 +69,14 @@ exports.project = {
 var Cache = {};
 exports.package = {
   get: function(req, res) {
+    var project = new Project({
+      name: req.params.name
+    });
+    var version = semver.maxSatisfying(Object.keys(project.packages), req.params.version);
+
     var p = new Package({
       name: req.params.name,
-      version: req.params.version
+      version: version
     });
     if (!p.md5) {
       abortify(res, { code: 404 });
@@ -142,25 +148,23 @@ exports.package = {
 
     Cache.package = new Package(data);
 
-    var force = req.headers['x-yuan-force'];
-    if(Cache.package.md5 && !force) {
+    if(Cache.package.md5) {
       return abortify(res, { code: 444 });
     }
 
-    var isNewProject;
     Cache.project = new Project(data);
     var isNewProject = !Cache.project['created_at'];
     if (isNewProject) {
       data.owners = [data.publisher];
     }
     Cache.project.update(data);
+    delete Cache.project.unpublished;
     if (isNewProject) {
       hook.emit('create:project', Cache.project, data.publisher);
     }
     res.send(200, {});
   },
   put: function(req, res) {
-    var data = req.body;
     var package = Cache.package;
     var project = Cache.project;
     if (!package) {
@@ -361,7 +365,7 @@ function abortify(res, options) {
     406: 'Not acceptable.',
     415: 'Unsupported media type.',
     426: 'Upgrade required.',
-    444: 'Force option required.'
+    444: 'Cannot modify pre-existing version.'
   };
   message = options.message || msgs[code];
   res.send(code, {
@@ -370,3 +374,5 @@ function abortify(res, options) {
     message: message
   });
 }
+
+