gitmine 0.1.12 → 0.1.13

data/Gemfile.lock

@@ -1,4 +1,5 @@
 GEM
+  remote: http://rubygems.org/
   specs:
     crack (0.1.8)
     diff-lcs (1.1.2)
@@ -8,19 +9,19 @@ GEM
     httparty (0.6.1)
       crack (= 0.1.8)
     mime-types (1.16)
-    rspec (2.0.0.beta.17)
-      rspec-core (= 2.0.0.beta.17)
-      rspec-expectations (= 2.0.0.beta.17)
-      rspec-mocks (= 2.0.0.beta.17)
-    rspec-core (2.0.0.beta.17)
-    rspec-expectations (2.0.0.beta.17)
-      diff-lcs (>= 1.1.2)
-    rspec-mocks (2.0.0.beta.17)
+    rspec (2.5.0)
+      rspec-core (~> 2.5.0)
+      rspec-expectations (~> 2.5.0)
+      rspec-mocks (~> 2.5.0)
+    rspec-core (2.5.1)
+    rspec-expectations (2.5.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.5.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  grit
-  httparty
-  rspec (= 2.0.0.beta.17)
+  grit (= 2.0.0)
+  httparty (= 0.6.1)
+  rspec (>= 2.0.0)

data/VERSION

@@ -1 +1 @@
-0.1.12
+0.1.13

data/gitmine.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gitmine}
-  s.version = "0.1.12"
+  s.version = "0.1.13"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Philippe Creux"]
-  s.date = %q{2011-02-25}
+  s.date = %q{2011-03-22}
   s.default_executable = %q{gitmine}
   s.description = %q{Git log with status of associated redmine tickets}
   s.email = %q{pcreux@gmail.com}
@@ -37,7 +37,6 @@ Gem::Specification.new do |s|
     "lib/gitmine/commit.rb",
     "lib/gitmine/config.rb",
     "lib/gitmine/git.rb",
-    "lib/gitmine/hudson_job.rb",
     "lib/gitmine/issue.rb",
     "spec/commit_msg_to_issue_id_spec.rb",
     "spec/commit_spec.rb",

data/lib/gitmine/branch.rb

@@ -85,6 +85,7 @@ class Gitmine
 
     def merge_to_master
       Git.checkout("master")
+      Git.pull
       Git.merge(self.name)
       Git.push
     end

data/lib/gitmine/cli.rb

@@ -23,7 +23,7 @@ gitmine checkout ISSUE_ID
   Example: gitmine checkout 1234
 
 gitmine reviewed ISSUE_ID
-  Merge the branch to master, delete remote branch, delete hudson jobs (if any), update redmine issue status
+  Merge the branch to master, delete remote branch, update redmine issue status
   Example: gitmine reviewed 1234
 
 gitmine delete ISSUE_ID

data/lib/gitmine/config.rb

@@ -19,18 +19,6 @@ class Gitmine
         config['github']
       end
 
-      def hudson_host
-        (config['hudson'] || {})['host']
-      end
-
-      def hudson_username
-        (config['hudson'] || {})['username']
-      end
-
-      def hudson_password
-        (config['hudson'] || {})['password']
-      end
-
       def statuses
         config['statuses']
       end

data/lib/gitmine/issue.rb

@@ -35,12 +35,6 @@ class Gitmine
       RemoteBranch.find(self.id)
     end
 
-    def delete_hudson_jobs
-      if Config.hudson_host
-        hudson_jobs.map(&:delete!)
-      end
-    end
-
     # Get attributes from redmine and set them all
     def build_via_issue_id(issue_id)
       @id = issue_id
@@ -84,10 +78,5 @@ class Gitmine
     def http_get(issue_id)
       self.class.get(url(issue_id))
     end
-
-    def hudson_jobs
-      HudsonJob.all_by_name_including(self.id)
-    end
-
   end
 end

data/lib/gitmine.rb

@@ -93,15 +93,12 @@ class Gitmine
     puts yellow("Delete remote branch")
     issue.remote_branch.delete
 
-    puts yellow("Delete hudson jobs")
-    issue.delete_hudson_jobs
-
     puts yellow("Set Ticket status to 'reviewed'")
     issue.update_status("reviewed")
   end
 end
 
 
-%w(config issue commit cli colors branch git hudson_job).each do |filename|
+%w(config issue commit cli colors branch git).each do |filename|
   require File.dirname(__FILE__) + "/gitmine/#{filename}.rb"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gitmine
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: false
   segments: 
   - 0
   - 1
-  - 12
-  version: 0.1.12
+  - 13
+  version: 0.1.13
 platform: ruby
 authors: 
 - Philippe Creux
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-25 00:00:00 -08:00
+date: 2011-03-22 00:00:00 -07:00
 default_executable: gitmine
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -94,7 +94,6 @@ files:
 - lib/gitmine/commit.rb
 - lib/gitmine/config.rb
 - lib/gitmine/git.rb
-- lib/gitmine/hudson_job.rb
 - lib/gitmine/issue.rb
 - spec/commit_msg_to_issue_id_spec.rb
 - spec/commit_spec.rb

data/lib/gitmine/hudson_job.rb

@@ -1,41 +0,0 @@
-class Gitmine
-  class HudsonJob
-    class Http
-      include HTTParty
-
-      base_uri Config.hudson_host
-      basic_auth(Config.hudson_username, Config.hudson_password) if Config.hudson_username
-      headers 'Content-type' => 'text/xml'
-      # I get timeout errors on heroku but not on local env. Is that because of REE-1.8.7 ?
-      # Workaround: Set the timeout to 10 seconds and rescue timeout errors.
-      default_timeout 8
-    end
-
-    def self.all_by_name_including(pattern)
-      HudsonJob.all.select { |projects| projects.name[pattern] }
-    end
-
-    def self.all
-      r = Http.get('/api/xml')
-      return [] unless r.code == 200
-      r.parsed_response["hudson"]["job"].map do |jobs_data|
-        new(jobs_data["name"])
-      end
-    end
-
-    attr_accessor :name
-
-    def initialize(name)
-      @name = name
-    end
-
-    def delete!
-      r = Http.post("/job/#{name}/doDelete")
-      raise "Failed to delete job #{name}" unless r.code == 200
-      puts green(" - #{name} deleted!")
-
-      true
-    end
-
-  end
-end