waggit 0.0.008 → 0.0.009

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NmViNzdlMTgxZTlmNjI5Y2UzZGVmYjM2MTczNTliMTRlMmZkNzc5MQ==
-  data.tar.gz: !binary |-
-    ZTM2MjBlOWMzMWQzMmJiYzFjNDc5Yzc1MDZlOTI1MjU5NjExYzZjMA==
+SHA1:
+  metadata.gz: 32d0652e458a68d433a19dcbf7e0bcd86c9ceaa1
+  data.tar.gz: 4e4a1c2b5eff37579bfed6f2d1d128fb2f8a4d7e
 SHA512:
-  metadata.gz: !binary |-
-    ZjgyMzkxNzYxMDNiYjA2MWY0YjA0Yjc5MjcwMDBkZjhlZDE2ODQ0OGU3ZDdl
-    ODhmZTA2MmZiYTM1NDljZjNmYzYyOTBlNjg2YjViOTFiNWQ1YzM2NGVlOWYz
-    NDFiNDM1NzRlOGM4M2YwZTM5NTJiZGI5NWMzNjU1NWJjNDI1NGU=
-  data.tar.gz: !binary |-
-    MmRmYjAzZDQ2NjRjYjNiZDRjNTNlMGQ0MDE5YTQ3NjhmYWRmMTQ2YzJlZjBi
-    ODg3NDA2ZjdiNzgzZGJiOTJiNjYwNmNiNWY2MjBiYTZiNmRmMmJjNDM1ODBk
-    ZWNiNDc1NWFiYzZlZDlmMGE0YzFjNGFjNmQwNjdiMzA1YTEwZDY=
+  metadata.gz: d12ce726686cf38c08058b793c1ce41856142a56767cc5569b8834f7ba2fa5700a0c61689512f6177be0a2686cc64f7f56b11ea30f21ad72a40d8ff763087123
+  data.tar.gz: 9d46e28deacea8a733a374779f7da3b6115db00d19837c99b8e5c3cac108905756a6798aa3365380ce8f63ff34953c6b3f9ae8f150531eaea38b34624f9d1c36

data/bin/waggit

@@ -19,8 +19,10 @@ when "s", "sync"
   Waggit.sync(options)
 when "f", "forcepush", "fp"
   Waggit.forcepush(options)
-when "p", "push"
+when "push"
   Waggit.push(options)
+when "pull"
+  Waggit.pull(options)
 when "c", "clean"
   Waggit.clean(options)
 else

data/lib/command.rb

@@ -1,7 +1,7 @@
 
 # Handles all direct interaction with Bash
 #
-class Command
+module Command
 
   # Runs a command and returns the output
   #

data/lib/files.rb

@@ -1,6 +1,6 @@
 # Helper class for manipulating file system
 #
-class Files
+module Files
 
   # If we have scss files that we edit, their compiled css equivalents need
   # to be deleted in order for wagon to recompile the scss

data/lib/git.rb

@@ -1,6 +1,6 @@
 require 'command.rb'
 
-class Git
+module Git
 
   @@wagon = "wagon-branch"
   @@local = "local-branch"

data/lib/waggit.rb

@@ -2,7 +2,7 @@ require 'git.rb'
 require 'wagon.rb'
 require 'files.rb'
 
-class Waggit
+module Waggit
 
   # Verifies that the current working directory is setup to work with both git and wagon
   #
@@ -36,6 +36,43 @@ class Waggit
     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"
+      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

data/lib/wagon.rb

@@ -1,6 +1,6 @@
 require 'command.rb'
 
-class Wagon
+module Wagon
 
   # Converts the provided options into the appropriate
   # string to append to the wagon command. 

metadata

@@ -1,18 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: waggit
 version: !ruby/object:Gem::Version
-  version: 0.0.008
+  version: 0.0.009
 platform: ruby
 authors:
 - Mere Agency
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-29 00:00:00.000000000 Z
+date: 2014-09-17 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.
-email: support@mereagency
+email: support@mereagency.com
 executables:
 - waggit
 extensions: []
@@ -34,12 +34,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []