waggit 0.0.011 → 0.0.012

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb6f12cca80872d6f3abf76d06d91e70e9f37b53
-  data.tar.gz: 6422510225fd24c204c13d58872a5e3aed54ce08
+  metadata.gz: 4e12a2d433f99bcae12d0035806d30f0a7a97948
+  data.tar.gz: 7ac23667b9bf78b81ae412a641aaf87b26b6485b
 SHA512:
-  metadata.gz: ead58380a6ad904aa0aa36c5239345ea51f2e7ffdd0da5d9ced0ea9d24dd616c1b17f5aa5ae255c41b2815fa3001bc3d526e42e80a25db249a5e9d603d0e7c24
-  data.tar.gz: 7b4e59fe4bc7211233d0cb227f2d3c41c0156fb96188b507cb292905e6498d34e4dfd19fb54c257f961bd1d97cca9c635555ae1eaf1dfc67c45ef276bddc1f60
+  metadata.gz: 65a6b2ecac24da89aad38c830bb2dd0d98ca331ac2de43c322553ccf6b5cf52f4cde6d907c54b10e6a9cfbf7f2f5a9b9ce9a9220214df8329e78bb417d0ea4d6
+  data.tar.gz: cf42c69b002a1acc8cc955779960f5e9e684a471af9faf49416688b1aabe362f174639823179fdc9394e5d57198169d53744c40b8feae59b337a6973738c9128

data/lib/git.rb

@@ -13,6 +13,7 @@ module Git
   # Git commit, will prompt user for commit message
   #
   def self.commit_prompt()
+    return unless has_changes?
     puts "Enter a git commit message:"
     message = $stdin.gets.chomp
     self.commit(message)

data/lib/waggit.rb

@@ -52,11 +52,13 @@ module Waggit
   # Push local changes to wagon, ignoring git.
   #
   def self.forcepush(options)
-    dir = get_waggit_dir
-    if dir
-      Dir.chdir(dir) do 
-        Files.clean_css
-        Wagon.push(options)
+    if confirm_push
+      dir = get_waggit_dir
+      if dir
+        Dir.chdir(dir) do 
+          Files.clean_css
+          Wagon.push(options)
+        end
       end
     end
   end
@@ -64,19 +66,21 @@ module Waggit
   # Commit local changes and keep in sync with git, then push to wagon.
   #
   def self.push(options)
-    dir = get_waggit_dir
-    if dir
-      Dir.chdir(dir) do 
-        Git.add_all
-        Git.commit_prompt
-        Files.clean_css
-        if Git.has_changes?
+    if confirm_push
+      dir = get_waggit_dir
+      if dir
+        Dir.chdir(dir) do 
           Git.add_all
-          Git.commit "cleaned css"
+          Git.commit_prompt
+          Files.clean_css
+          if Git.has_changes?
+            Git.add_all
+            Git.commit "cleaned css"
+          end
+          Git.pull
+          Git.push
+          Wagon.push(options)
         end
-        Git.pull
-        Git.push
-        Wagon.push(options)
       end
     end
   end
@@ -114,7 +118,7 @@ module Waggit
           Git.delete_wagon
           Git.delete_local
       	rescue Exception
-          "Pull aborted, switching back to master branch"
+          puts "Pull aborted, switching back to master branch"
           Git.checkout_master
           raise
         end
@@ -166,7 +170,7 @@ module Waggit
 
           Wagon.push(options)
         rescue Exception
-          "Sync aborted, switching back to master branch"
+          puts "Sync aborted, switching back to master branch"
           Git.checkout_master
           raise
         end
@@ -174,4 +178,25 @@ module Waggit
     end
   end
 
+  # Since pushing local content can overwrite remote content
+  # we want the user to confirm the operation
+  #
+  def self.confirm_push()
+    puts "Performing this operation will overwrite content on the server."
+    response = nil
+    while response.nil?
+      puts "Do you want to continue? [y/n]"
+      response = gets.chomp.downcase
+      case response
+      when "y", "yes"
+        return true
+      when "n", "no"
+        return false
+      else
+        puts "Invalid response! Plese try again."
+        response = nil
+      end
+    end
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: waggit
 version: !ruby/object:Gem::Version
-  version: 0.0.011
+  version: 0.0.012
 platform: ruby
 authors:
 - Mere Agency
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-17 00:00:00.000000000 Z
+date: 2014-10-02 00:00:00.000000000 Z
 dependencies: []
 description: A way of integrating LocomotiveCMS/Wagon with git. This is under development
   and not ready for active use.