redmine_stagecoach 0.6.10 → 0.6.12

data/Gemfile

@@ -1,7 +1,7 @@
 source "http://rubygems.org"
 
 gem 'activeresource'
-gem 'ghi', :git => 'git://github.com/stephencelis/ghi.git'
+gem 'ghi', "~> 0.9.0.dev1"#, :git => 'git://github.com/stephencelis/ghi.git'
 gem 'trollop'
 gem 'capistrano'
 

data/Gemfile.lock

@@ -1,9 +1,3 @@
-GIT
-  remote: git://github.com/stephencelis/ghi.git
-  revision: 1eef298c50744b54d06925d70c5bc26225f51d3d
-  specs:
-    ghi (0.9.0.20120501)
-
 GEM
   remote: http://rubygems.org/
   specs:
@@ -23,14 +17,15 @@ GEM
       net-sftp (>= 2.0.0)
       net-ssh (>= 2.0.14)
       net-ssh-gateway (>= 1.1.0)
+    ghi (0.9.0.dev1)
     git (1.2.5)
-    highline (1.6.11)
+    highline (1.6.12)
     i18n (0.6.0)
     jeweler (1.6.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    multi_json (1.3.2)
+    multi_json (1.3.5)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
     net-sftp (2.0.5)
@@ -53,7 +48,7 @@ DEPENDENCIES
   activeresource
   bundler (~> 1.0.0)
   capistrano
-  ghi!
+  ghi (~> 0.9.0.dev1)
   jeweler (~> 1.6.4)
   shoulda
   trollop

data/VERSION

@@ -1 +1 @@
-0.6.10
+0.6.12

data/bin/stagecoach

@@ -4,7 +4,8 @@ require File.dirname(__FILE__) + '/../lib/stagecoach.rb'
 
 module Stagecoach
   VERSION = File.open(File.dirname(__FILE__) + '/../VERSION').read
-  CONFIG_FILE = `pwd`.chomp + '/.stagecoach~'
+  CONFIG_FILE = `pwd`.chomp + '/.stagecoach'
+  OLD_CONFIG_FILE = `pwd`.chomp + '/.stagecoach~'
 
   # Command line options courtesy of the Trollop gem.
   opts = CommandLine.trollop
@@ -101,7 +102,7 @@ module Stagecoach
         exit
       end
 
-      if redmine_issue.status.id != '1'
+      if redmine_issue.status.id != 1
         puts "Warning!".red
         puts "This issue is in status '#{redmine_issue.status.name}'"
         begin 
@@ -119,6 +120,7 @@ module Stagecoach
 
       # Set the redmine issue status to 'In Bearbeitung'
       redmine_issue.status_id = 2
+      redmine_issue.assigned_to_id = config["redmine_user_id"]
       redmine_issue.save
     end
 
@@ -198,17 +200,11 @@ module Stagecoach
       # Create a Git issue.
       github_issue =  Git.new_issue(redmine_issue.subject, body)
       github_issue_id = github_issue[/\d+/]
+      Git.assign_issue_to_me(github_issue_id)
 
       # Save it so we can reference it in commits using the magic of git hooks!
       config[Git.current_branch] = {:github_issue => github_issue_id, :redmine_issue => redmine_issue_number}
 
-
-      print "Would you like to edit the issue on Github? [Y]es or anything else to continue:  "
-
-      if STDIN.gets.chomp == 'Y'
-        Git.view_issue(github_issue_id) 
-      else
-      end
     end
 
     # Github issues are easier.
@@ -236,7 +232,7 @@ module Stagecoach
     unless Git.branch_has_commits?(branch)
       puts "You don't have any uncommitted changes on branch #{branch}."
       puts "If you have already pushed your changes, run:"
-      puts "stagecoach -d [deploy_branch]  - default is 'staging'"
+      puts "stagecoach -d [deploy_branch]"
       puts "Otherwise, go make some commits!"
       puts "#%s for help" % "stagecoach -h".green
       puts "Exiting..."
@@ -263,8 +259,6 @@ module Stagecoach
       end
     end
 
-    # TODO this needs removing if we implement the 'deploy to staging' stuff
-    # Stop anybody deploying master to staging...
     case branch
     when 'master', 'Master', 'staging', 'Staging' 
       puts "You can't use stagecoach to deploy your #{branch} branch.\nExiting..."
@@ -276,7 +270,7 @@ module Stagecoach
 
     puts "Push successful."  
     unless opts[:deploy_given]
-      "stagecoach -d [branch_name] to deploy (default is staging)."
+      "stagecoach -d [branch_name] to deploy."
       "exiting..."
       exit
     end
@@ -299,11 +293,23 @@ module Stagecoach
     # Redmine issue to feedback status
     if redmine_issue_number =  config[from_branch][:redmine_issue]
       CommandLine.line_break
-      puts "Attempting to change Redmine ticket status to 'Feedback' for you:"
-      issue = Redmine.issue(redmine_issue_number)
-      issue.status_id = 4
-      issue.save
-      Redmine.view_issue(issue)
+      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'
+        puts "Attempting to change Redmine ticket status to 'Feedback' for you..."
+        issue = Redmine.issue(redmine_issue_number)
+        issue.status_id = 4
+        issue.save
+        puts "Status set to 'Feedback'"
+      when 'E', 'e'
+        puts "Attempting to change Redmine ticket status to 'Erledigt' for you..."
+        issue = Redmine.issue(redmine_issue_number)
+        issue.status_id = 5
+        issue.save
+        puts "Status set to 'Erledigt'"
+      else
+      end
+        puts 'Completed deploy.'
     end
   end
 end

data/lib/githooks/commit-msg

@@ -30,7 +30,7 @@ end
 if gem_available?('redmine_stagecoach') == false
   exit
 else
-  config = YAML::load(File.open(File.dirname(__FILE__) + '/../../.stagecoach~', 'r'))
+  config = YAML::load(File.open(File.dirname(__FILE__) + '/../../.stagecoach', 'r'))
 end
 
 # Find out what branch we are on

data/lib/stagecoach/config.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 require 'psych'
 require 'yaml'
 require 'fileutils'
@@ -6,7 +7,14 @@ module Stagecoach
   class Config
     class << self
       def new
-        File.open(CONFIG_FILE, 'w') { |f| f.write("---\nredmine_site: none\nredmine_api_key: none")}
+        File.open(CONFIG_FILE, 'w') { |f| f.write("---\nredmine_site: \nredmine_api_key: \nredmine_user_id:")}
+      end
+
+      def check_if_outdated
+        if File.exist?(OLD_CONFIG_FILE) && !File.exist?(CONFIG_FILE)
+          FileUtils.move(OLD_CONFIG_FILE, CONFIG_FILE)
+          puts "Stagecoach config is now at #{CONFIG_FILE}"
+        end
       end
 
       def open
@@ -44,7 +52,8 @@ module Stagecoach
         # Create a config file if necessary 
         case STDIN.gets.chomp
         when 'C'
-        Config.new unless File.exist?(CONFIG_FILE) 
+          Config.check_if_outdated
+          Config.new unless File.exist?(CONFIG_FILE) 
         when 'Q'
           puts "Exiting..."
           exit
@@ -120,23 +129,39 @@ module Stagecoach
         # TODO Some verification of the input at this stage, for example test the
         # connection and have the user re-enter the details if necessary 
         # http://api.rubyonrails.org/classes/ActiveResource/Connection.html#method-i-head
-        loop do 
+        config = Config.yaml_to_hash
+        unless config["redmine_site"] && config["redmine_api_key"] && config["redmine_user_id"]
           CommandLine.line_break
           print "Enter your redmine/planio repository, eg. https://digitaleseiten.plan.io:  "
-          redmine_repo = STDIN.gets.chomp
+          redmine_site = STDIN.gets.chomp 
           print "Enter your API key for that repo:  "
           redmine_api_key = STDIN.gets.chomp
 
-          Config.save({"redmine_site" => redmine_repo, "redmine_api_key"  => redmine_api_key})
+          RedmineApi::Client.instance_eval do
+            self.site = config["redmine_site"] || redmine_site
+            self.user = config["redmine_api_key"] || redmine_api_key
+          end
+
+          all_users = Redmine.users
+
+          puts "ID    |  User Name"
+          all_users.each {|u| puts printf("%-5d",u.attributes["id"]).to_s + " | " + u.attributes["firstname"] + " " + u.attributes["lastname"]} rescue puts "This one"
+
+          puts "Which id is yours?"
+          user_id = STDIN.gets.chomp
+          Config.save({"redmine_site" => redmine_site, "redmine_api_key"  => redmine_api_key, "redmine_user_id" => user_id.to_i })
 
           CommandLine.line_break
           puts "Settings saved OK:"
-          puts "Repository: " + redmine_repo
-          puts "API Key:    " + redmine_api_key
+          puts "Repository: " + redmine_site if redmine_site
+          puts "API Key:    " + redmine_api_key if redmine_api_key
+          puts "User ID:    " + user_id if user_id
           CommandLine.line_break
           puts "Exiting..."
-          exit
         end 
+         
+        exit
+
       end 
     end
   end

data/lib/stagecoach/git.rb

@@ -97,7 +97,11 @@ module Stagecoach
       end
 
       def new_issue(title, description)
-        `ghi -o "#{title}" -m "#{description}"`
+        `ghi open -m "#{title}\n#{description}"`
+      end
+
+      def assign_issue_to_me(issue_number)
+        `ghi assign #{issue_number}`
       end
 
       def branch_has_commits?(branch)
@@ -109,12 +113,8 @@ module Stagecoach
         end
       end
 
-      def view_issue(github_issue)
-        `ghi -u#{github_issue}`
-      end
-
       def issue(id)
-        `ghi -l #{id}`
+        `ghi list #{id}`
       end
     end
   end

data/lib/stagecoach/redmine.rb

@@ -4,29 +4,37 @@ require 'active_resource'
 module RedmineApi
   class Client < ActiveResource::Base; end
   class Issue < RedmineApi::Client; end
+  class Users < RedmineApi::Client; end
 end
 
 module Stagecoach
   class Redmine
-    def self.issue(issue_number)
-      return RedmineApi::Issue.find(issue_number)
-    end
+    class << self
 
-    def self.issue_url(issue)
-      # originally this was:
-      #
-      # RedmineApi::Client.site + "/issues/" + issue.id
-      #
-      # but this caused URI merge errors on some setups.
-      "#{RedmineApi::Client.site}/issues/#{issue.id}"
-    end
+      def users
+        RedmineApi::Users.find(:all, :params => {:nometa => 1})  
+      end
+
+      def issue(issue_number)
+        return RedmineApi::Issue.find(issue_number)
+      end
+
+      def issue_url(issue)
+        # originally this was:
+        #
+        # RedmineApi::Client.site + "/issues/" + issue.id
+        #
+        # but this caused URI merge errors on some setups.
+        "#{RedmineApi::Client.site}/issues/#{issue.id}"
+      end
 
-    # Open the issue in a browser.
-    def self.view_issue(issue)
-      issue_url = Redmine.issue_url(issue)
+      # Open the issue in a browser.
+      def view_issue(issue)
+        issue_url = Redmine.issue_url(issue)
         print "Open issue in browser? [Y]es or anything else to exit:  "
         `open #{issue_url.to_s}` if gets.chomp == "Y"
         puts "Staging completed!  Exiting..."
+      end
     end
   end
 end

data/redmine_stagecoach.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "redmine_stagecoach"
-  s.version = "0.6.10"
+  s.version = "0.6.12"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Oli Barnett"]
-  s.date = "2012-05-04"
+  s.date = "2012-05-18"
   s.description = "Git/capistrano workflow automation script with Redmine & Github issue integration"
   s.email = "o.barnett@digitaleseiten.de"
   s.executables = ["stagecoach"]
@@ -42,7 +42,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/omnikron/stagecoach"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.18"
+  s.rubygems_version = "1.8.24"
   s.summary = "Stagecoach is in ur Redmine, automating ur Git workflow."
 
   if s.respond_to? :specification_version then
@@ -50,7 +50,7 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activeresource>, [">= 0"])
-      s.add_runtime_dependency(%q<ghi>, [">= 0"])
+      s.add_runtime_dependency(%q<ghi>, ["~> 0.9.0.dev1"])
       s.add_runtime_dependency(%q<trollop>, [">= 0"])
       s.add_runtime_dependency(%q<capistrano>, [">= 0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
@@ -58,7 +58,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
     else
       s.add_dependency(%q<activeresource>, [">= 0"])
-      s.add_dependency(%q<ghi>, [">= 0"])
+      s.add_dependency(%q<ghi>, ["~> 0.9.0.dev1"])
       s.add_dependency(%q<trollop>, [">= 0"])
       s.add_dependency(%q<capistrano>, [">= 0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
@@ -67,7 +67,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<activeresource>, [">= 0"])
-    s.add_dependency(%q<ghi>, [">= 0"])
+    s.add_dependency(%q<ghi>, ["~> 0.9.0.dev1"])
     s.add_dependency(%q<trollop>, [">= 0"])
     s.add_dependency(%q<capistrano>, [">= 0"])
     s.add_dependency(%q<shoulda>, [">= 0"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redmine_stagecoach
 version: !ruby/object:Gem::Version
-  version: 0.6.10
+  version: 0.6.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-04 00:00:00.000000000Z
+date: 2012-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeresource
@@ -32,17 +32,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.0.dev1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.0.dev1
 - !ruby/object:Gem::Dependency
   name: trollop
   requirement: !ruby/object:Gem::Requirement
@@ -168,7 +168,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3067216657449835751
+      hash: -1007617363068209098
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -177,7 +177,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.18
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Stagecoach is in ur Redmine, automating ur Git workflow.