redmine_stagecoach 0.7.3 → 0.7.5

data/VERSION

@@ -1 +1 @@
-0.7.3
+0.7.5

data/bin/stagecoach

@@ -105,10 +105,10 @@ module Stagecoach
     if opts[:github].nil? && opts[:redmine].nil?
       print "Are you working on a [R]edmine or a [G]ithub issue:  "
       case STDIN.gets.chomp
-      when 'R'
+      when /r/i
         print "Please enter your Redmine issue number:  "
         opts[:redmine] = gets.chomp
-      when 'G'
+      when /g/i
         print "Please enter your Github issue number:  "
         opts[:github] = gets.chomp
       end
@@ -126,7 +126,6 @@ module Stagecoach
       end
 
       if redmine_issue.status.id != 1
-        puts "Warning!".red
         puts "This issue is in status '#{redmine_issue.status.name}'"
         begin 
           puts "It is assigned to #{redmine_issue.assigned_to.name}"
@@ -135,8 +134,8 @@ module Stagecoach
         end
         print "Continue? [Y]es or [Q]uit:  "
         case STDIN.gets.chomp
-        when 'Y'
-        when 'Q'  
+        when /Y/i
+        when /Q/i  
           exit
         end
       end
@@ -192,9 +191,9 @@ module Stagecoach
         exit
       end
       case STDIN.gets.chomp
-      when 'U'
+      when /u/i
         Git.change_to_branch(new_branch)
-      when 'Q'
+      when /q/i
         exit
       end
     else
@@ -272,9 +271,9 @@ module Stagecoach
       print " or "
       print "[anything else] to cancel:  ".green
       case STDIN.gets.chomp
-      when "D"
+      when /p/i
         CommandLine.line_break
-        puts "DEPLOYING:"
+        puts "Pushing:"
         CommandLine.line_break
       else 
         puts "Exiting..."
@@ -283,8 +282,8 @@ module Stagecoach
     end
 
     case branch
-    when 'master', 'Master', 'staging', 'Staging' 
-      puts "You can't use stagecoach to deploy your #{branch} branch.\nExiting..."
+    when /master/i 
+      puts "You can't use stagecoach to push your #{branch} branch.\nExiting..."
       exit
     end
 
@@ -309,8 +308,11 @@ module Stagecoach
     from_branch = Git.current_branch
     to_branch = opts[:deploy]
 
-    Git.merge(to_branch, from_branch)
-    Git.push(to_branch)
+    unless to_branch =~ /master/i
+      Git.merge(to_branch, from_branch)
+      Git.push(to_branch)
+    end
+
     Capistrano.deploy(to_branch)
 
     # Redmine issue to feedback status
@@ -318,7 +320,7 @@ module Stagecoach
       CommandLine.line_break
       puts "Would you like to change your Redmine ticket status to [F]eedback or [E]rledigt? Leave blank to do nothing: "
       case STDIN.gets.chomp
-      when 'F', 'f'
+      when /f/i
         puts "Attempting to change Redmine ticket status to 'Feedback' for you..."
         issue = Redmine.issue(redmine_issue_number)
         issue.status_id = 4

data/lib/stagecoach/capistrano.rb

@@ -3,6 +3,8 @@ module Stagecoach
     class << self
       def deploy(branch)
         CommandLine.line_break
+        branch = branch =~ /master/i ? 'production' : branch
+
         puts "Deploying to #{branch}"
         puts `bundle exec cap #{branch} deploy`
       end

data/lib/stagecoach/config.rb

@@ -51,10 +51,10 @@ module Stagecoach
 
         # Create a config file if necessary 
         case STDIN.gets.chomp
-        when 'C'
+        when /c/i
           Config.check_if_outdated
           Config.new unless File.exist?(CONFIG_FILE) 
-        when 'Q'
+        when /q/i
           puts "Exiting..."
           exit
         end
@@ -98,7 +98,7 @@ module Stagecoach
         print "[I]nstall or [S]kip this step:  "
         loop do
           case STDIN.gets.chomp
-          when 'I'
+          when /i/i
             if File.exist?(install_dir + git_hook)
               case FileUtils.compare_file(source_dir + git_hook, install_dir + git_hook) 
               when true
@@ -106,9 +106,9 @@ module Stagecoach
                 break
               when false
                 puts "You have a commit-msg githook already.  Are you sure you want to install?  This will #{'overwrite'.red} your current commit-msg githook."
-                print "Type [overwrite] to continue or anything else to skip installation:  "
+                print "[O]K or anything else to skip installation:  "
                 case STDIN.gets.chomp
-                when 'overwrite'
+                when /o/i
                   Config.githook_install(source_dir, install_dir, git_hook)
                   break
                 else
@@ -120,7 +120,7 @@ module Stagecoach
               Config.githook_install(source_dir, install_dir, git_hook)
               break
             end
-          when 'S'
+          when /s/i
             puts 'Skipping Installation.'
             break
           end

data/lib/stagecoach/git.rb

@@ -19,7 +19,7 @@ module Stagecoach
           end 
         end
         CommandLine.line_break
-        puts "*".red + " = merged to master, can be deleted by stagecoach -t"
+        puts "*".red + " = merged to master, can be deleted by stagecoach -t" if deletable_branches.length > 0
         CommandLine.line_break
         deletable_branches
       end
@@ -35,7 +35,7 @@ module Stagecoach
           puts "All branches that have been merged into master will be deleted locally and remotely.".red
           print "Continue? [Y]es or anything else to cancel: "
           case STDIN.gets.chomp
-          when 'Y' 
+          when /y/i 
             erase(deletable_branches) 
           else
             puts 'No branches deleted.  Exiting...'
@@ -99,8 +99,8 @@ module Stagecoach
         CommandLine.line_break
         print "You are currently in local branch: #{Git.current_branch.red} \nAre these details correct? ([Y]es or [Q]uit):  "
         case STDIN.gets.chomp
-        when "Y"
-        when "Q"
+        when /y/i
+        when /q/i
           exit
         else
           puts "Please enter Y to continue or Q to quit."
@@ -120,9 +120,9 @@ module Stagecoach
         else
           print "Branch '#{branch}' does not exist. [C]reate or [Q]uit:  "
           case STDIN.gets.chomp
-          when 'C'
+          when /c/i
             new_branch(branch)
-          when 'Q'     
+          when /q/i     
             exit
           end
         end

data/redmine_stagecoach.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "redmine_stagecoach"
-  s.version = "0.7.3"
+  s.version = "0.7.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Oli Barnett"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redmine_stagecoach
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.5
   prerelease: 
 platform: ruby
 authors:
@@ -168,7 +168,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2188982439199770630
+      hash: -124324135115026598
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: