ors 0.2.2 → 0.2.3

data/lib/ors/commands/sync.rb

@@ -9,10 +9,15 @@ module ORS::Commands
         environments = [environment]
       end
 
-      environments.each do |e|
-        unless ORS::Config.git.branches[e].nil?
-          info "Syncing environment/branch #{e}..."
-          system "git co master && git co #{e} && git pull && git merge master && git push && git co master"
+      environments.each do |environment|
+        unless ORS::Config.git.branches[environment].nil?
+          info "Syncing environment/branch #{environment}..."
+          execute_command :localhost, %(git checkout master),
+                                      %(git checkout #{environment}),
+                                      %(git pull),
+                                      %(git rebase master),
+                                      %(git push),
+                                      %(git checkout master)
         end
       end
     end

data/lib/ors/helpers.rb

@@ -83,6 +83,7 @@ module ORS
     def execute_command server, *command_array
       options = {:exec => false, :capture => false}
       options.merge!(command_array.pop) if command_array.last.is_a?(Hash)
+      options[:local] = true if server.to_s == "localhost"
 
       command = build_command(server, command_array, options)
 
@@ -118,10 +119,14 @@ module ORS
       commands = command_array.join " && "
       psuedo_tty = options[:exec] ? '-t ' : ''
 
-      if use_gateway
-        %(ssh #{psuedo_tty}#{gateway} 'ssh #{psuedo_tty}#{deploy_user}@#{server} "#{commands}"')
+      if options[:local]
+        commands
       else
-        %(ssh #{psuedo_tty}#{deploy_user}@#{server} "#{commands}")
+        if use_gateway
+          %(ssh #{psuedo_tty}#{gateway} 'ssh #{psuedo_tty}#{deploy_user}@#{server} "#{commands}"')
+        else
+          %(ssh #{psuedo_tty}#{deploy_user}@#{server} "#{commands}")
+        end
       end
     end
 

data/lib/ors/version.rb

@@ -1,3 +1,3 @@
 module ORS
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ors
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Jason Dew and John Long
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-19 00:00:00 -04:00
+date: 2011-04-25 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency