git-storyid 0.2.1 → 0.3.0

data/Gemfile

@@ -2,6 +2,10 @@ source "http://rubygems.org"
 
 gem "pivotal-tracker"
 group :development do
-  gem "rspec", "~> 2.8.0"
+  gem "webmock"
+  gem "debugger", :platform => "ruby_19"
+  gem "mocha"
+  gem "rspec"
   gem "jeweler", "~> 1.8.3"
+  gem "hashie"
 end

data/Gemfile.lock

@@ -1,11 +1,22 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    addressable (2.3.2)
     builder (3.0.0)
-    diff-lcs (1.1.3)
+    columnize (0.3.6)
+    crack (0.3.1)
+    debugger (1.2.1)
+      columnize (>= 0.3.1)
+      debugger-linecache (~> 1.1.1)
+      debugger-ruby_core_source (~> 1.1.4)
+    debugger-linecache (1.1.2)
+      debugger-ruby_core_source (>= 1.1.1)
+    debugger-ruby_core_source (1.1.4)
+    diff-lcs (1.2.1)
     git (1.2.5)
     happymapper (0.4.0)
       libxml-ruby (~> 2.0)
+    hashie (1.2.0)
     jeweler (1.8.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
@@ -13,7 +24,10 @@ GEM
       rdoc
     json (1.7.3)
     libxml-ruby (2.3.3)
+    metaclass (0.0.1)
     mime-types (1.19)
+    mocha (0.13.2)
+      metaclass (~> 0.0.1)
     nokogiri (1.5.5)
     pivotal-tracker (0.5.4)
       builder
@@ -29,19 +43,26 @@ GEM
       json (~> 1.4)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    rspec (2.8.0)
-      rspec-core (~> 2.8.0)
-      rspec-expectations (~> 2.8.0)
-      rspec-mocks (~> 2.8.0)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.8.0)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.0)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.0)
+    webmock (1.8.7)
+      addressable (>= 2.2.7)
+      crack (>= 0.1.7)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  debugger
+  hashie
   jeweler (~> 1.8.3)
+  mocha
   pivotal-tracker
-  rspec (~> 2.8.0)
+  rspec
+  webmock

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.3.0

data/git-storyid.gemspec

@@ -4,15 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{git-storyid}
-  s.version = "0.2.1"
+  s.name = "git-storyid"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bogdan Gusiev"]
-  s.date = %q{2013-02-19}
-  s.default_executable = %q{git-storyid}
-  s.description = %q{Helps include pivotal story id and description in commit}
-  s.email = %q{agresso@gmail.com}
+  s.date = "2013-03-06"
+  s.description = "Helps include pivotal story id and description in commit"
+  s.email = "agresso@gmail.com"
   s.executables = ["git-storyid"]
   s.extra_rdoc_files = [
     "LICENSE.txt",
@@ -34,28 +33,40 @@ Gem::Specification.new do |s|
     "spec/git_storyid_spec.rb",
     "spec/spec_helper.rb"
   ]
-  s.homepage = %q{http://github.com/bogdan/git-storyid}
+  s.homepage = "http://github.com/bogdan/git-storyid"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.0}
-  s.summary = %q{Attach commits to pivotal stories}
+  s.rubygems_version = "1.8.24"
+  s.summary = "Attach commits to pivotal stories"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<pivotal-tracker>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.8.0"])
+      s.add_development_dependency(%q<webmock>, [">= 0"])
+      s.add_development_dependency(%q<debugger>, [">= 0"])
+      s.add_development_dependency(%q<mocha>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
+      s.add_development_dependency(%q<hashie>, [">= 0"])
     else
       s.add_dependency(%q<pivotal-tracker>, [">= 0"])
-      s.add_dependency(%q<rspec>, ["~> 2.8.0"])
+      s.add_dependency(%q<webmock>, [">= 0"])
+      s.add_dependency(%q<debugger>, [">= 0"])
+      s.add_dependency(%q<mocha>, [">= 0"])
+      s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
+      s.add_dependency(%q<hashie>, [">= 0"])
     end
   else
     s.add_dependency(%q<pivotal-tracker>, [">= 0"])
-    s.add_dependency(%q<rspec>, ["~> 2.8.0"])
+    s.add_dependency(%q<webmock>, [">= 0"])
+    s.add_dependency(%q<debugger>, [">= 0"])
+    s.add_dependency(%q<mocha>, [">= 0"])
+    s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
+    s.add_dependency(%q<hashie>, [">= 0"])
   end
 end
 

data/lib/git_storyid.rb

@@ -11,10 +11,11 @@ class GitStoryid
   end
 
   def initialize(*arguments)
+    @git_options = []
     parser = 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
+      opts.on("-m", "--message [MESSAGE]", "Add addional MESSAGE to comit") do |custom_message|
+        @custom_message = custom_message
       end
     end
     parser.parse!(arguments)
@@ -35,51 +36,83 @@ class GitStoryid
   end
 
   def readline_stories_if_not_present
-    return if @stories
+    if !@stories || @stories.empty?
+      quit_if_no_stories
+      output stories_menu
+      @stories  = readline_story_ids.map do |index|
+        all_stories[index - 1] || (quit("Story index #{index} not found."))
+      end
+    end
+  end
+
+  def output(message)
+    puts message
+  end
+
+  def quit_if_no_stories
     if all_stories.empty?
       quit "No stories started and owned by you."
     end
+  end
+
+  def stories_menu
+    result = ""
     all_stories.each_with_index do |story, index|
-      puts "[#{index + 1}] #{story.name}"
+      result << "[#{index + 1}] #{story.name}\n"
     end
-    puts ""
-    @stories  = Readline.readline("Indexes(csv): ", true).split(/\s*,\s*/).reject do |string|
+    result << "\n"
+    result
+  end
+
+  def readline_story_ids
+    Readline.readline("Indexes(csv): ", true).split(/\s*,\s*/).reject do |string|
       string == ""
-    end.map do |string|
-      index = string.to_i
-      all_stories[index - 1] || (quit("Story index #{index} not found."))
-    end
+    end.map {|id| id.to_i }
   end
 
   def quit(message)
-    puts message
+    output message
     exit 1
   end
 
   def run
-    if execute("git", "diff", "--staged").empty?
-      quit "No changes staged to commit."
-    end
-
+    ensure_changes_stashed!
     readline_stories_if_not_present
+    commit_changes
+  end
 
+  def commit_changes
+    output execute("git", "commit", "-m", build_commit_message)
+  end
+
+  def build_commit_message
     message = ("[#{@stories.map { |s| "\##{s.id}"}.join(", ")}]").rjust 12
     message += ' '
-    if @message && !@message.empty?
-      message += @message.to_s + "\n\n"
+    if @custom_message && !@custom_message.empty?
+      message += @custom_message.to_s + "\n\n"
     end
-    message += @stories.map {|s| "Feature: " + s.name.strip}.join("\n\n")
-    puts execute("git", "commit", "-m", message)
+    message += @stories.map {|s| "#{s.story_type.capitalize}: " + s.name.strip}.join("\n\n")
+    message
   end
 
   def execute(*args)
     Open3.popen3(*args) {|i, o| return o.read }
   end
 
+  def ensure_changes_stashed!
+    if execute("git", "diff", "--staged").empty?
+      quit "No changes staged to commit."
+    end
+  end
 
 
   module Configuration
     class << self
+
+    def config=(config)
+      @config = config
+    end
+
     def read
       return if @loaded
       load_config
@@ -89,7 +122,8 @@ class GitStoryid
     end
 
     def load_config
-      @config = load_config_from(global_config_path)
+      @config ||= {}
+      @config.merge!(load_config_from(global_config_path))
       @project_config = load_config_from(project_config_path)
       @config.merge!(@project_config)
     end
@@ -118,7 +152,7 @@ class GitStoryid
           file.write YAML.dump(@project_config)
         end
         @config.merge!(@project_config)
-        puts "Writing config to .pivotalrc"
+        output "Writing config to .pivotalrc"
       end
     end
 

data/spec/git_storyid_spec.rb

@@ -3,12 +3,107 @@ require "fileutils"
 
 describe GitStoryid do
 
+  let(:commands) { []}
+
+  def run(*args)
+    GitStoryid.run(*args)
+  end
+
   before(:each) do
-    FileUtils.rm_rf("spec/repo")
-    FileUtils.mkdir_p("spec/repo")
-    FileUtils.cd("spec/repo")
-    `git init`
+    GitStoryid::Configuration.config = {
+      "api_token" => "a2b4e",
+      "use_ssl" => false,
+      "me" => "BG",
+      "project_id" => "1234"
+    }
+    commands = self.commands
+    GitStoryid.send(:define_method, :execute) do |*args|
+      commands << args
+      ""
+    end
+
+    GitStoryid.any_instance.stubs(:ensure_changes_stashed!).returns(true)
+    GitStoryid.any_instance.stubs(:readline_story_ids).returns([1])
+    GitStoryid.any_instance.stubs(:output).returns(true)
+
+    GitStoryid::Configuration.stubs(:project).returns(Hashie::Mash.new(
+      :initial_velocity => 10,
+      :labels => "bonobos,true&co,website",
+      :id => 135657,
+      :week_start_day => "Monday",
+      :use_https => false,
+      :iteration_length => 1,
+      :account => "Allan Grant",
+      :name => "Curebit Marketing",
+      :stories => PivotalTracker::Story,
+      :last_activity_at => DateTime.now,
+      :velocity_scheme => "Average of 3 iterations",
+      :current_iteration_number => 122,
+      :current_velocity => 19,
+      :point_scale => "0,1,2,3",
+      :first_iteration_start_time => DateTime.now
+    ))
+
+    GitStoryid.any_instance.stubs(:all_stories).returns([
+      Hashie::Mash.new(
+        :deadline => nil,
+        :labels => "paypal",
+        :accepted_at => nil,
+        :id => 44647731,
+        :jira_id => nil,
+        :estimate => 1,
+        :integration_id => nil,
+        :owned_by => "Bogdan Gusiev",
+        :name => "Strip Default paypal credentials",
+        :created_at => DateTime.now,
+        :story_type => "feature",
+        :other_id => nil,
+        :description => "",
+        :requested_by => "Dominic Coryell",
+        :url => "http://www.pivotaltracker.com/story/show/44647731",
+        :attachments => [],
+        :project_id => 135657,
+        :jira_url => nil,
+        :current_state => "finished",
+      ),
+      Hashie::Mash.new(
+        :deadline => nil,
+        :labels => "paypal",
+        :accepted_at => nil,
+        :id => 44647732,
+        :jira_id => nil,
+        :estimate => 1,
+        :integration_id => nil,
+        :owned_by => "Bogdan Gusiev",
+        :name => "Require pro paypal account for mass payments",
+        :created_at => DateTime.now,
+        :story_type => "feature",
+        :other_id => nil,
+        :description => "",
+        :requested_by => "Dominic Coryell",
+        :url => "http://www.pivotaltracker.com/story/show/44647732",
+        :attachments => [],
+        :project_id => 135657,
+        :jira_url => nil,
+        :current_state => "finished"
+      )
+    ])
   end
 
+  it "should commit changes" do
+    run("-m",  'Hello world')
+    commands.should include(["git", "commit", "-m", " [#44647731] Hello world\n\nFeature: Strip Default paypal credentials"])
+  end
+
+  it "should render stories menu correctly" do
+    subject.stories_menu.should == <<-EOI
+[1] Strip Default paypal credentials
+[2] Require pro paypal account for mass payments
+
+EOI
+  end
+
+
+
 
 end

data/spec/spec_helper.rb

@@ -1,12 +1,17 @@
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'rspec'
+require "webmock"
+require "hashie"
 require 'git-storyid'
 
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
+WebMock.disable_net_connect!
+
 RSpec.configure do |config|
+  config.mock_with :mocha
   
 end

metadata

@@ -1,79 +1,137 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: git-storyid
-version: !ruby/object:Gem::Version 
-  hash: 21
+version: !ruby/object:Gem::Version
+  version: 0.3.0
   prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 1
-  version: 0.2.1
 platform: ruby
-authors: 
+authors:
 - Bogdan Gusiev
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-02-19 00:00:00 +02:00
-default_executable: git-storyid
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id001
-  prerelease: false
+date: 2013-03-06 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: pivotal-tracker
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 47
-        segments: 
-        - 2
-        - 8
-        - 0
-        version: 2.8.0
-  version_requirements: *id002
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: debugger
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 49
-        segments: 
-        - 1
-        - 8
-        - 3
+      - !ruby/object:Gem::Version
         version: 1.8.3
-  version_requirements: *id003
+  type: :development
   prerelease: false
-  name: jeweler
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.3
+- !ruby/object:Gem::Dependency
+  name: hashie
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Helps include pivotal story id and description in commit
 email: agresso@gmail.com
-executables: 
+executables:
 - git-storyid
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.md
-files: 
+files:
 - .document
 - .rspec
 - Gemfile
@@ -88,39 +146,32 @@ files:
 - lib/git_storyid.rb
 - spec/git_storyid_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/bogdan/git-storyid
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 596398730235191081
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.0
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Attach commits to pivotal stories
 test_files: []
-