shelltoad 0.4.4 → 0.4.5

data/Gemfile

@@ -5,10 +5,12 @@ gem "hoptoad-api"
 
 group :development do
   gem 'jeweler'
+  gem "ruby-debug"
 end
 
 group :test do
   gem 'rspec'
-  gem 'fakeweb'
+  gem 'fakeweb', :require => 'fakeweb'
   gem "mocha"
+  gem "http_logger"
 end # do

data/Gemfile.lock

@@ -1,6 +1,7 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    columnize (0.3.2)
     crack (0.1.8)
     diff-lcs (1.1.2)
     fakeweb (1.3.0)
@@ -9,12 +10,14 @@ GEM
     hoptoad-api (2.3.0)
       hashie (>= 0.2.0)
       httparty (>= 0.5.2)
+    http_logger (0.1.0)
     httparty (0.6.1)
       crack (= 0.1.8)
     jeweler (1.5.2)
       bundler (~> 1.0.0)
       git (>= 1.2.5)
       rake
+    linecache (0.43)
     mocha (0.9.12)
     rake (0.8.7)
     rspec (2.5.0)
@@ -25,6 +28,11 @@ GEM
     rspec-expectations (2.5.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.5.0)
+    ruby-debug (0.10.4)
+      columnize (>= 0.1)
+      ruby-debug-base (~> 0.10.4.0)
+    ruby-debug-base (0.10.4)
+      linecache (>= 0.3)
 
 PLATFORMS
   ruby
@@ -32,7 +40,9 @@ PLATFORMS
 DEPENDENCIES
   fakeweb
   hoptoad-api
+  http_logger
   jeweler
   mocha
   rake
   rspec
+  ruby-debug

data/Rakefile

@@ -19,3 +19,6 @@ Jeweler::Tasks.new do |gemspec|
   gemspec.homepage = "http://github.com/railsware/shelltoad"
   gemspec.authors = ["Bogdan Gusiev"]
 end
+
+task :default => :spec do
+end

data/Readme.textile

@@ -17,7 +17,8 @@ h3. Commands
 * errors, ers - list all unresolved errors, this is the default
 * error, er [number] - display information about given error. Shortcut: shelltoad [number]
 * resolve, rv [number] - mark error as resolved in Hoptoad
-* commit, ci [number] - do commit to vcs with the information on the specified error and mark error resolved in Hoptoad
+* commit, ci [number] - do commit to git with the information on the specified error and mark error resolved in Hoptoad
+** -m, --message [MESSAGE] - adds aditional message to the one generated by shelltoad
 * open, op [number] - open error page in browser
 
 Shelltoad supports 'magicfind' in all commands: 
@@ -46,7 +47,7 @@ ActiveRecord::StatementInvalid: PGError: ERROR: duplicate key value violates uni
 # Do changes you want
 $ git add .
 #only git is supported right now
-$ shelltoad commit 713 
+$ shelltoad commit -m "Fixed concurrent db queries problem for company_relations table" 713
 [dev 47f09ec]     http://xxx.hoptoadapp.com//errors/4023713
  1 files changed, 1 insertions(+), 1 deletions(-)</code></pre>
 

data/VERSION

@@ -1 +1 @@
-0.4.4
+0.4.5

data/lib/shelltoad/command.rb

@@ -21,7 +21,7 @@ class Shelltoad
             output error.view
           end
         when "commit", "ci"
-          commit(args.shift)
+          commit(*args)
         when "resolve", "rv"
           magic_find(args.shift) do |error|
             error.resolve!
@@ -57,9 +57,20 @@ class Shelltoad
         Shelltoad.output(*args)
       end
 
-      def commit(id)
-        magic_find(id) do |error|
-          output error.commit!
+      def commit(*args)
+        opts = OptionParser.new do |opts|
+          opts.banner = "Do git commit with information from pivotal story"
+          opts.on("-m [MESSAGE]", "Add addional MESSAGE to comit") do |message|
+            @message = message
+          end
+        end
+        opts.parse!(args)
+
+        unless self.changes_staged?
+          raise Shelltoad::BaseException, "No changes staged with git."
+        end
+        magic_find(args.shift) do |error|
+          output error.commit!(@message)
         end
       end # commit(id, args)
 
@@ -71,6 +82,10 @@ class Shelltoad
         end
       end
 
+      def changes_staged?
+        !`git diff --staged`.empty?
+      end
+
       def display_help
         output <<-EOI
 Usage: shelltoad command [<args>]

data/lib/shelltoad/error.rb

@@ -59,6 +59,7 @@ class Shelltoad
       URI.parse("#{Configuration.secure? ? "https" : "http"}://#{Configuration.account}.hoptoadapp.com")
     end
 
+
     #
     # API
     #
@@ -84,12 +85,21 @@ class Shelltoad
       EOI
     end
 
-    def commit!
-      message = <<-EOI.gsub(/`/, "'")
-      #{url.to_s}
 
-      #{self.error_message}
-      EOI
+    def commit!(custom_message)
+      
+      message = ""
+      unless custom_message.nil? || custom_message.strip.empty?
+        message << custom_message + "\n"
+        message << "\n"
+      end
+      message << url.to_s + "\n"
+      if custom_message.nil? || custom_message.strip.empty?
+        message << "\n"
+      end
+      message << self.error_message + "\n"
+      message.gsub!(/`/, "'")
+
       output = `git commit -m "#{message}"`
       if $?.success?
         resolve!

data/shelltoad.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{shelltoad}
-  s.version = "0.4.4"
+  s.version = "0.4.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bogdan Gusiev"]
-  s.date = %q{2011-04-28}
+  s.date = %q{2011-05-31}
   s.default_executable = %q{shelltoad}
   s.description = %q{
 }
@@ -53,15 +53,18 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<rake>, [">= 0"])
       s.add_runtime_dependency(%q<hoptoad-api>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
+      s.add_development_dependency(%q<ruby-debug>, [">= 0"])
     else
       s.add_dependency(%q<rake>, [">= 0"])
       s.add_dependency(%q<hoptoad-api>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<ruby-debug>, [">= 0"])
     end
   else
     s.add_dependency(%q<rake>, [">= 0"])
     s.add_dependency(%q<hoptoad-api>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<ruby-debug>, [">= 0"])
   end
 end
 

data/spec/shelltoad_spec.rb

@@ -11,7 +11,7 @@ describe Shelltoad do
     subject { Shelltoad.run(*args) }
 
 
-    [["error", TEST_ERROR], "errors", ["commit", TEST_ERROR], ["resolve", TEST_ERROR]].each do |command|
+    [["error", TEST_ERROR], "errors",  ["resolve", TEST_ERROR]].each do |command|
       describe "command:#{command.inspect}" do
         let(:args) {  Array(command) }
         it { should == 0 }
@@ -25,13 +25,35 @@ describe Shelltoad do
         Shelltoad::Configuration.stubs(:browser).returns("true")
       end
       it {should  == 0}
-      
+
     end
 
     describe "help commad" do
       let(:args) { "help" }
       it {should == 0}
     end
+
+    describe "commit command" do
+      subject { Shelltoad.run("commit", TEST_ERROR, *_args) }
+      before(:each) do
+        Shelltoad::Command.stubs(:changes_staged?).returns(_staged)
+      end
+      
+      let(:_staged) { true }
+      let(:_args) { [] }
+      it { should == 0 }
+      
+      context "when no changes staged in git" do
+        let(:_staged) { false }
+        it { should == 1 }
+      end
+
+      context "when -m argument specified" do
+        let(:_args) { ["-m", "My commit"]}
+        it {should == 0}
+      end
+
+    end
   end
 
 end

data/spec/spec_helper.rb

@@ -5,9 +5,29 @@ require "net/http"
 require 'rspec'
 require "mocha"
 require "fakeweb"
+require "http_logger"
+
+
+unless File.exists?(".shelltoadrc")
+  f = File.new(".shelltoadrc", "w")
+  f << YAML.dump(
+    "project" => "startdatelabs",
+    "key" => "123456",
+    "secure" => true
+  )
+  f.close
+
+end
+
+
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__),'..','lib'))
 require "shelltoad"
 
+require "fileutils"
+require "logger"
+
+FileUtils.rm_f("http.log")
+Net::HTTP.logger = Logger.new("http.log")
 
 TEST_ERROR = 4040123
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: shelltoad
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: false
   segments: 
   - 0
   - 4
-  - 4
-  version: 0.4.4
+  - 5
+  version: 0.4.5
 platform: ruby
 authors: 
 - Bogdan Gusiev
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-28 00:00:00 +03:00
+date: 2011-05-31 00:00:00 +03:00
 default_executable: shelltoad
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -60,6 +60,20 @@ dependencies:
         version: "0"
   requirement: *id003
   type: :development
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: ruby-debug
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id004
+  type: :development
 description: |