git-runner-deploy 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 391c6b17b3feaa48e361581e5545da6046f0db54
-  data.tar.gz: 5ca2f915d73f198fc00c9ff63bee910ed4816f73
+  metadata.gz: 1f2da21103512291854c878d6438d517941367a5
+  data.tar.gz: 7e4f5136ae27f59394737147c3e4c493dbf06c0c
 SHA512:
-  metadata.gz: 4ff52f97346cd4db10ffaf8468c1332cb634a83bddd62b4c6df5e5bc6198eba3486acb1b89c00477362c93a14f2b4348e53f4f3ef8f8b08d3d0ac4a2e7887c60
-  data.tar.gz: 8d88de1869aedc7640e59a0b85cbfe9b8aa29d214d595abf2fdfda66e1d9843d5138340a4289a0c2a0126d4bddf04a07b7b648c357a4c445befe1fec6ec3995c
+  metadata.gz: 6b8bb8ff2ad4f52a17da7b87ad0281a8c5725abc4fd9306e23cdd3f2e17508889cd989f8efabd308807343b6e8586cec2d52fab5e7fa4e3bb609a51f1ffb0260
+  data.tar.gz: 4a9521c6ddf9acddf2d0530f923f2486fc54555ab3ae6a98f74423add0e78fd74cc021d8cc4dba098cc4d00374adb9558d91b180281b3f63661afe4d17ae3e17

data/lib/git-runner-deploy.rb

@@ -7,7 +7,7 @@ module GitRunner
 
     # Performs deployments using capistrano (cap deploy)
     class Deploy < Base
-      VERSION = '0.1.5'
+      VERSION = '0.2.0'
 
       attr_accessor :clone_directory
 
@@ -24,7 +24,6 @@ module GitRunner
         Text.out(Text.green("Performing Deploy (#{environment_from_branch(branch)})"), :heading)
 
         checkout_branch
-        ensure_presence_of_capfile
         prepare_deploy_environment
         perform_deploy
 
@@ -40,17 +39,32 @@ module GitRunner
 
 
     private
-      def branches
-        args.split(/\s+/)
+      def default_deploy_command(branch_name)
+        if multistage?
+          "cap #{branch_name == 'master' ? 'production' : branch} deploy"
+        else
+          "cap deploy"
+        end
       end
 
-      def ensure_presence_of_capfile
-        unless File.exists?("#{clone_directory}/Capfile")
-          Text.out(Text.red("Missing Capfile, unable to complete deploy."))
-          fail!
+      def branches_with_commands
+        b_args = args.dup
+
+        if !b_args.empty? && b_args.scan(/\((.*?)(?:="(.*?)"?)?\)/).empty?
+          # Support old format for branch declarations
+          b_args = b_args.split(/\s+/).map { |a| "(#{a})" }.join
+        end
+
+        b_args.scan(/\((.*?)(?:="(.*?)"?)?\)/).inject({}) do |hash, (branch, command)|
+          hash[branch] = command || default_deploy_command(branch)
+          hash
         end
       end
 
+      def branches
+        branches_with_commands.keys
+      end
+
       def uses_bundler?
         File.exists?("#{clone_directory}/Gemfile")
       end
@@ -98,29 +112,25 @@ module GitRunner
       end
 
       def perform_deploy
-        cap_deploy_command = if multistage?
-          Text.out("Deploying application (multistage detected)")
-          "cap #{environment_from_branch(branch)} deploy"
-        else
-          Text.out("Deploying application")
-          "cap deploy"
-        end
+        deploy_command = branches_with_commands[branch.name] || default_deploy_command(branch.name)
 
         # 'bundle exec' if bundler is being used
-        cap_deploy_command = "bundle exec #{cap_deploy_command}" if uses_bundler?
+        deploy_command = "bundle exec #{deploy_command}" if uses_bundler?
+
+        Text.out("Deploying application (#{deploy_command})")
 
         Text.indent do
           execute(
             "cd #{clone_directory}",
-            cap_deploy_command,
-            :errproc => method(:cap_deploy_outproc)
+            deploy_command,
+            :errproc => method(:deploy_outproc)
           )
         end
 
         GitRunner::Hooks.fire(:deploy_success, self)
       end
 
-      def cap_deploy_outproc(out)
+      def deploy_outproc(out)
         if out =~ /executing `(.*)'/
           case $1
           when 'deploy:update_code'

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: git-runner-deploy
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors:
 - James Brooks
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-26 00:00:00.000000000 Z
+date: 2014-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git-runner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.2
 description: Capistrano deploy module for git-runner
@@ -31,7 +31,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -47,17 +47,17 @@ 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: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Capistrano deploy module for git-runner