waggit 0.0.009 → 0.0.011

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32d0652e458a68d433a19dcbf7e0bcd86c9ceaa1
-  data.tar.gz: 4e4a1c2b5eff37579bfed6f2d1d128fb2f8a4d7e
+  metadata.gz: fb6f12cca80872d6f3abf76d06d91e70e9f37b53
+  data.tar.gz: 6422510225fd24c204c13d58872a5e3aed54ce08
 SHA512:
-  metadata.gz: d12ce726686cf38c08058b793c1ce41856142a56767cc5569b8834f7ba2fa5700a0c61689512f6177be0a2686cc64f7f56b11ea30f21ad72a40d8ff763087123
-  data.tar.gz: 9d46e28deacea8a733a374779f7da3b6115db00d19837c99b8e5c3cac108905756a6798aa3365380ce8f63ff34953c6b3f9ae8f150531eaea38b34624f9d1c36
+  metadata.gz: ead58380a6ad904aa0aa36c5239345ea51f2e7ffdd0da5d9ced0ea9d24dd616c1b17f5aa5ae255c41b2815fa3001bc3d526e42e80a25db249a5e9d603d0e7c24
+  data.tar.gz: 7b4e59fe4bc7211233d0cb227f2d3c41c0156fb96188b507cb292905e6498d34e4dfd19fb54c257f961bd1d97cca9c635555ae1eaf1dfc67c45ef276bddc1f60

data/bin/waggit

@@ -4,9 +4,9 @@ require 'waggit.rb'
 
 cmd = ARGV[0].downcase
 
-for arg in ARGV
-  puts "arg: #{arg}"
-end
+#for arg in ARGV
+  #puts "arg: #{arg}"
+#end
 
 options = []
 if ARGV.length > 1
@@ -25,6 +25,8 @@ when "pull"
   Waggit.pull(options)
 when "c", "clean"
   Waggit.clean(options)
+when "t", "test"
+  Waggit.test_dir(options)
 else
   puts "Invalid command!"
 end

data/lib/command.rb

@@ -3,11 +3,29 @@
 #
 module Command
 
-  # Runs a command and returns the output
+  # Runs a command and passes output to standard out, 
+  # and returns the result
   #
-  def self.run(command)
-    return `#{command}`
+  def self.run(command, output = true)
+    IO.popen "#{command}" do |fd|
+      if output
+        until fd.eof?
+          puts fd.readline
+        end
+      end
+    end
+    return $?.success?
   end
+    #Open3.capture3( "#{command}") do |stdin, stdout, status|
+    #  if output
+     #   until stdin.eof?
+      #    stdout.puts stdin.readline
+       # end
+   #   end
+    #return status.success?
+    #end
+    #return `#{command}`
+  #end
 
 
 end

data/lib/git.rb

@@ -1,4 +1,4 @@
-require 'command.rb'
+require 'command'
 
 module Git
 
@@ -104,4 +104,11 @@ module Git
     puts "This does nothin yet"
   end
 
+  # Return true if the provided directory is in a git repo, otherwise false. Can optionally provide wa
+  #
+  def self.is_git_dir?(dir = Dir.pwd)
+      return Dir.chdir dir do 
+        return Command.run("git rev-parse", false)
+      end
+  end
 end

data/lib/waggit.rb

@@ -1,122 +1,176 @@
-require 'git.rb'
-require 'wagon.rb'
-require 'files.rb'
+require 'git'
+require 'wagon'
+require 'files'
 
 module Waggit
 
   # Verifies that the current working directory is setup to work with both git and wagon
   #
-  def self.test()
-    puts "test... doesn't work yet"
+  def self.test_dir(options={})
+    test = true
+    if !Git.is_git_dir?
+      # FIXME: Cannot find a way to capture the output of the above git method, 
+      # so there is another error that is output: 'fatal: Not a git repository 
+      # (or any of the parent directories): .git'
+
+      #puts "error: not in a git directory."
+      test = false
+    end 
+    if !Wagon.is_wagon_dir?
+      puts "error: Not in a wagon directory."
+      test = false
+    end 
+    if test
+      puts "Current directory is both a wagon and a git directory"
+    end
+    return test
+  end
+
+  # Waggit can only really work if it is in a directory that has both git and
+  # wagon setup. This finds an appropriate working directory with both waggit 
+  # and git and return the path as a string or return nil.
+  #
+  def self.get_waggit_dir()
+    dir = Wagon.get_wagon_path
+    puts "error: Unable to find a Wagon directory in your current path." unless dir
+    if dir
+      dir = Git.is_git_dir?(dir) ? dir : nil
+      puts "error: Wagon directory is not setup with git: #{dir}" unless dir
+    end
+    return dir
   end
 
-  def self.clean(options)
-    Files.clean_css
+  def self.clean(options={})
+    dir = get_waggit_dir
+    if dir
+      Dir.chdir(dir) do 
+        Files.clean_css
+      end
+    end
   end
 
   # Push local changes to wagon, ignoring git.
   #
   def self.forcepush(options)
-    Files.clean_css
-    puts Wagon.push(options)
+    dir = get_waggit_dir
+    if dir
+      Dir.chdir(dir) do 
+        Files.clean_css
+        Wagon.push(options)
+      end
+    end
   end
 
   # Commit local changes and keep in sync with git, then push to wagon.
   #
   def self.push(options)
-    puts Git.add_all
-    puts Git.commit_prompt
-    Files.clean_css
-    if Git.has_changes?
-      puts Git.add_all
-      puts Git.commit "cleaned css"
+    dir = get_waggit_dir
+    if dir
+      Dir.chdir(dir) do 
+        Git.add_all
+        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
     end
-    puts Git.pull
-    puts Git.push
-    puts Wagon.push(options)
   end
 
   def self.pull(options)
-    begin
-      puts Git.checkout_master
-      puts Git.delete_wagon
-      puts Git.delete_local
-      puts Git.stash
-
-      puts Git.checkout_new_wagon
-      puts Wagon.pull(options)
-      #TODO: Checkout: http://stackoverflow.com/questions/3515597/git-add-only-non-whitespace-changes
-      if Git.has_changes?
-        puts Git.add_all
-        puts Git.commit "merge wagon pull"
+    dir = get_waggit_dir
+    if dir
+      Dir.chdir(dir) do 
+        begin
+          Git.checkout_master
+          Git.delete_wagon
+          Git.delete_local
+          Git.stash
+
+          Git.checkout_new_wagon
+          Wagon.pull(options)
+          #TODO: Checkout: http://stackoverflow.com/questions/3515597/git-add-only-non-whitespace-changes
+          if Git.has_changes?
+            Git.add_all
+            Git.commit "merge wagon pull"
+          end
+
+          Git.checkout_master
+          Git.rebase_wagon
+          Git.checkout_master
+          Git.merge_wagon
+
+          Git.checkout_new_local
+          Git.stash_pop
+          Git.add_all
+          Git.commit_prompt
+          Git.rebase_local
+          Git.checkout_master
+          Git.merge_local
+          Git.delete_wagon
+          Git.delete_local
+      	rescue Exception
+          "Pull aborted, switching back to master branch"
+          Git.checkout_master
+          raise
+        end
       end
-
-      puts Git.checkout_master
-      puts Git.rebase_wagon
-      puts Git.checkout_master
-      puts Git.merge_wagon
-
-      puts Git.checkout_new_local
-      puts Git.stash_pop
-      puts Git.add_all
-      puts Git.commit_prompt
-      puts Git.rebase_local
-      puts Git.checkout_master
-      puts Git.merge_local
-      puts Git.delete_wagon
-      puts Git.delete_local
-  	rescue Exception
-      puts "Pull aborted, switching back to master branch"
-      puts Git.checkout_master
-      raise
     end
-
   end
 
   def self.sync(options)
-    begin
-      puts Git.checkout_master
-      puts Git.delete_wagon
-      puts Git.delete_local
-      puts Git.stash
-
-      puts Git.checkout_new_wagon
-      puts Wagon.pull(options)
-      #TODO: Checkout: http://stackoverflow.com/questions/3515597/git-add-only-non-whitespace-changes
-      if Git.has_changes?
-        puts Git.add_all
-        puts Git.commit "merge wagon pull"
+    dir = get_waggit_dir
+    if dir
+      Dir.chdir(dir) do 
+        begin
+          Git.checkout_master
+          Git.delete_wagon
+          Git.delete_local
+          Git.stash
+
+          Git.checkout_new_wagon
+          Wagon.pull(options)
+          #TODO: Checkout: http://stackoverflow.com/questions/3515597/git-add-only-non-whitespace-changes
+          if Git.has_changes?
+            Git.add_all
+            Git.commit "merge wagon pull"
+          end
+
+          Git.checkout_master
+          Git.rebase_wagon
+          Git.checkout_master
+          Git.merge_wagon
+
+          Git.checkout_new_local
+          Git.stash_pop
+          Git.add_all
+          Git.commit_prompt
+          Git.rebase_local
+          Git.checkout_master
+          Git.merge_local
+          Git.delete_wagon
+          Git.delete_local
+
+          Files.clean_css
+          if Git.has_changes?
+            Git.add_all
+            Git.commit "cleaned css"
+          end
+
+          Git.pull
+          Git.push
+
+          Wagon.push(options)
+        rescue Exception
+          "Sync aborted, switching back to master branch"
+          Git.checkout_master
+          raise
+        end
       end
-
-      puts Git.checkout_master
-      puts Git.rebase_wagon
-      puts Git.checkout_master
-      puts Git.merge_wagon
-
-      puts Git.checkout_new_local
-      puts Git.stash_pop
-      puts Git.add_all
-      puts Git.commit_prompt
-      puts Git.rebase_local
-      puts Git.checkout_master
-      puts Git.merge_local
-      puts Git.delete_wagon
-      puts Git.delete_local
-
-      Files.clean_css
-      if Git.has_changes?
-        puts Git.add_all
-        puts Git.commit "cleaned css"
-      end
-
-      puts Git.pull
-      puts Git.push
-
-      puts Wagon.push(options)
-    rescue Exception
-      puts "Sync aborted, switching back to master branch"
-      puts Git.checkout_master
-      raise
     end
   end
 

data/lib/wagon.rb

@@ -52,8 +52,6 @@ module Wagon
     else
       return ''
     end
-
-
   end
 
   def self.pull(options)
@@ -64,4 +62,37 @@ module Wagon
     Command.run("bundle exec wagon push production#{self.process_options(options)}")
   end
 
+
+  # FROM : https://github.com/locomotivecms/wagon/blob/master/lib/locomotive/wagon/cli.rb#L8-L31
+  # This method is heavily tweaked and may require more modifications to be acurate.
+  # Check if the path given in option ('.' by default) points to a LocomotiveCMS
+  # site. It is also possible to pass a path other than the one from the options.
+  #
+  # @param [ String ] path The optional path of the site instead of options['path']
+  #
+  # @return [ String ] The fullpath to the LocomotiveCMS site or nil if it is not a valid site.
+  #
+  def self.is_wagon_dir?(path = '.')
+    path = path == '.' ? Dir.pwd : File.expand_path(path)
+    return  File.exists?(File.join(path, 'config', 'site.yml')) 
+  end
+
+  # Determines if there is a wagon path in the immediate directory or the directory above it. 
+  # If so, the path will be returned, otherwise nill. This does not search sub directories.
+  def self.get_wagon_path()
+    dir = nil
+    if is_wagon_dir? Dir.pwd
+      dir = Dir.pwd
+    else
+      require 'pathname'
+      Pathname.new(Dir.pwd).ascend do |parent|
+        if is_wagon_dir? parent
+          dir = parent.to_s
+          break
+        end
+      end
+    end
+    return dir
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: waggit
 version: !ruby/object:Gem::Version
-  version: 0.0.009
+  version: 0.0.011
 platform: ruby
 authors:
 - Mere Agency