octodmin 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25769485b174a543c10c85b8cb1ebf99ca8c91ab
-  data.tar.gz: b76e24969e9b7af79ae149d8afc5f6cb38993f44
+  metadata.gz: 207917c44b0ad259fd325ac59a1ef6b87acb50dc
+  data.tar.gz: 28f2f2ec10f07ae8b2d6429050de0fb9a540064c
 SHA512:
-  metadata.gz: ebbe2421ce23ccb9d75d5e34219a033af078ff00d1b874c96744349ae76bf6d9914109107863aa2f0c29b6e4e3b41059d5136e048760370f12342f6d946522c7
-  data.tar.gz: 754ba99ebfbfc6dd7100963895c96da4703c2587bee523b99a614584bfdd969eeeb9d83b574c92491a825306b25626e7b15e1d10fc6f0ce67265b0696d555147
+  metadata.gz: 53ec4a89d232f58233bffb16a074df6031a5d0ae015667dced1fe2e5525dd4547f87258fd4ac7bf66a9ca0232fdc40b13890038df500e85ead94ce3c5c768c05
+  data.tar.gz: dc14442b02b80843460ac4863b711e2a9662a69546478baebb8db7f751ce2741cdac15846da77d9fe79362836c546b4ac8805cf6afd5f5e07ccc0e0224fc1bbd

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+v0.3.3
+------
+
+* Make sync really delete files
+
 v0.3.2
 ------
 

data/app/controllers/syncs/create.rb

@@ -16,7 +16,7 @@ module Octodmin::Controllers::Syncs
       git.pull
 
       # Commit and push changes if any
-      commit(site, git)
+      sync(site, git)
     rescue Git::GitExecuteError => e
       halt 400, JSON.dump(errors: [e.message])
     ensure
@@ -25,12 +25,15 @@ module Octodmin::Controllers::Syncs
 
     private
 
+    def deleted(site)
+      site.status.deleted.keys.map { |path| File.join(Octodmin::App.dir, path) }
+    end
+
     def stage(site, git)
       # Posts
-      deleted = site.status.deleted.keys.map { |path| File.join(Octodmin::App.dir, path) }
       site.posts.each do |post|
         path = File.join(site.source, post.path)
-        git.add(path) unless deleted.include?(path)
+        git.add(path) unless deleted(site).include?(path)
       end
 
       # Uploads
@@ -47,13 +50,14 @@ module Octodmin::Controllers::Syncs
       end
     end
 
-    def commit(site, git)
+    def sync(site, git)
       staged = paths(site, git)
 
       if staged.any?
         @message  = "Octodmin sync for #{staged.count} file#{"s" if staged.count > 1}"
         @message += "\n\n#{staged.join("\n")}"
 
+        deleted(site).each { |path| File.delete(path) }
         git.commit(@message)
         git.push
       else

data/lib/octodmin/version.rb

@@ -1,3 +1,3 @@
 module Octodmin
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

data/spec/api/syncs_spec.rb

@@ -79,6 +79,8 @@ end
         subject { parse_json(last_response.body)["syncs"] }
 
         it "returns syncs" do
+          expect(File.exists?("sample/_posts/2015-01-29-welcome-to-jekyll.markdown")).to be_falsey
+
           expect(subject).to eql([[
             "Octodmin sync for 4 files\n",
             "octodmin/2015-01-30-test/ear.png",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octodmin
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Dmitry Krasnoukhov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-11 00:00:00.000000000 Z
+date: 2015-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octopress