git-storyid 0.3.5 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a9a29277089575a0e5895d972606d9557b2d858
-  data.tar.gz: 63d5358ab8337ae52af55d557828d12759824aef
+  metadata.gz: 56549fea6495f60b2c872b7decff12ced0a7b3be
+  data.tar.gz: ca961d3da3235eaaa74efac733dcb4cb00e3c24e
 SHA512:
-  metadata.gz: ad3882859335767c3b38bd5d3c6e57f672b08678ea995cd4af552b4c71defb783b7deade122a4696a280f3dc63a73892ee36e933cfa197adaad737fb346c872d
-  data.tar.gz: 1d7e393f9840d833d7aa3027aee8a1947d45e57b8dea53f2f2f3c88c58937d66722ef155a1680025a25fd44afd1f9a11e1c8bff2a6e385bb9303a12790a55159
+  metadata.gz: 9079a32c507af4e585b03377658b01809f44d74bf30f6ecc9cfbdc055787ade41b70b72def15b0d969697379d96bef69ef0438b5b3f7c7ac28278e2bf31196c4
+  data.tar.gz: 3de0ae28685b01233941147a85ceae06c8d04ea8e78c5841ce22efc91b8dc8cf1070758e83bee3c7b212479d2509826f8fe92827cca312b615fc43230ae7b2cb

data/Gemfile

@@ -1,6 +1,8 @@
 source "http://rubygems.org"
 
 gem "pivotal-tracker"
+gem "jira-ruby"
+
 group :development do
   gem "webmock"
   gem "debugger", :platform => "ruby_19"
@@ -8,4 +10,6 @@ group :development do
   gem "rspec"
   gem "jeweler"
   gem "hashie"
+  gem "pry-byebug", require: false
+  gem "http_logger"
 end

data/Gemfile.lock

@@ -1,56 +1,136 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.3.2)
-    builder (3.0.0)
-    columnize (0.3.6)
-    crack (0.3.1)
-    debugger (1.2.1)
+    activesupport (5.0.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    addressable (2.5.0)
+      public_suffix (~> 2.0, >= 2.0.2)
+    builder (3.2.2)
+    byebug (9.0.5)
+    coderay (1.1.1)
+    columnize (0.9.0)
+    concurrent-ruby (1.0.3)
+    crack (0.4.3)
+      safe_yaml (~> 1.0.0)
+    debugger (1.6.8)
       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.6)
-    happymapper (0.4.0)
-      libxml-ruby (~> 2.0)
-    hashie (1.2.0)
-    jeweler (2.0.1)
-      bundler (~> 1.0)
+      debugger-linecache (~> 1.2.0)
+      debugger-ruby_core_source (~> 1.3.5)
+    debugger-linecache (1.2.0)
+    debugger-ruby_core_source (1.3.8)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
+    diff-lcs (1.2.5)
+    domain_name (0.5.20161129)
+      unf (>= 0.0.5, < 1.0.0)
+    faraday (0.9.2)
+      multipart-post (>= 1.2, < 3)
+    git (1.3.0)
+    github_api (0.11.3)
+      addressable (~> 2.3)
+      descendants_tracker (~> 0.0.1)
+      faraday (~> 0.8, < 0.10)
+      hashie (>= 1.2)
+      multi_json (>= 1.7.5, < 2.0)
+      nokogiri (~> 1.6.0)
+      oauth2
+    hashdiff (0.3.1)
+    hashie (3.4.6)
+    highline (1.7.8)
+    http-cookie (1.0.3)
+      domain_name (~> 0.5)
+    http_logger (0.5.1)
+    i18n (0.7.0)
+    jeweler (2.3.1)
+      builder
+      bundler (>= 1.0)
       git (>= 1.2.5)
+      github_api (~> 0.11.0)
+      highline (>= 1.6.15)
+      nokogiri (>= 1.5.10)
+      psych (~> 2.2)
       rake
       rdoc
-    json (1.8.1)
-    libxml-ruby (2.7.0)
-    metaclass (0.0.1)
-    mime-types (1.19)
-    mocha (0.13.2)
+      semver
+    jira-ruby (1.1.3)
+      activesupport
+      oauth (~> 0.5, >= 0.5.0)
+    jwt (1.5.6)
+    metaclass (0.0.4)
+    method_source (0.8.2)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    mini_portile2 (2.1.0)
+    minitest (5.10.1)
+    mocha (1.2.1)
       metaclass (~> 0.0.1)
-    nokogiri (1.5.5)
-    pivotal-tracker (0.5.4)
+    multi_json (1.12.1)
+    multi_xml (0.6.0)
+    multipart-post (2.0.0)
+    netrc (0.11.0)
+    nokogiri (1.6.8.1)
+      mini_portile2 (~> 2.1.0)
+    nokogiri-happymapper (0.5.9)
+      nokogiri (~> 1.5)
+    oauth (0.5.1)
+    oauth2 (1.2.0)
+      faraday (>= 0.8, < 0.10)
+      jwt (~> 1.0)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (>= 1.2, < 3)
+    pivotal-tracker (0.5.13)
       builder
-      happymapper (>= 0.3.2)
-      nokogiri (>= 1.4.3)
-      nokogiri (~> 1.4)
-      rest-client (~> 1.6.0)
-    rake (10.3.2)
-    rdoc (4.1.1)
-      json (~> 1.4)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
-    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)
+      crack
+      nokogiri (>= 1.5.5)
+      nokogiri-happymapper (>= 0.5.4)
+      rest-client (>= 1.8.0)
+    pry (0.10.4)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    pry-byebug (3.4.0)
+      byebug (~> 9.0)
+      pry (~> 0.10)
+    psych (2.2.2)
+    public_suffix (2.0.4)
+    rack (2.0.1)
+    rake (12.0.0)
+    rdoc (5.0.0)
+    rest-client (2.0.0)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 4.0)
+      netrc (~> 0.8)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.4)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+    safe_yaml (1.0.4)
+    semver (1.0.1)
+    slop (3.6.0)
+    thread_safe (0.3.5)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.2)
+    webmock (2.3.1)
+      addressable (>= 2.3.6)
+      crack (>= 0.3.2)
+      hashdiff
 
 PLATFORMS
   ruby
@@ -58,8 +138,14 @@ PLATFORMS
 DEPENDENCIES
   debugger
   hashie
+  http_logger
   jeweler
+  jira-ruby
   mocha
   pivotal-tracker
+  pry-byebug
   rspec
   webmock
+
+BUNDLED WITH
+   1.13.3

data/VERSION

@@ -1 +1 @@
-0.3.5
+0.4.0

data/git-storyid.gemspec

@@ -2,19 +2,19 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: git-storyid 0.3.5 ruby lib
+# stub: git-storyid 0.4.0 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = "git-storyid"
-  s.version = "0.3.5"
+  s.name = "git-storyid".freeze
+  s.version = "0.4.0"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.require_paths = ["lib"]
-  s.authors = ["Bogdan Gusiev"]
-  s.date = "2016-01-13"
-  s.description = "Helps include pivotal story id and description in commit"
-  s.email = "agresso@gmail.com"
-  s.executables = ["git-storyid"]
+  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib".freeze]
+  s.authors = ["Bogdan Gusiev".freeze]
+  s.date = "2017-01-11"
+  s.description = "Helps include pivotal story id and description in commit".freeze
+  s.email = "agresso@gmail.com".freeze
+  s.executables = ["git-storyid".freeze]
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.md"
@@ -32,42 +32,52 @@ Gem::Specification.new do |s|
     "git-storyid.gemspec",
     "lib/git-storyid.rb",
     "lib/git_storyid.rb",
+    "spec/git_storyid/jira_spec.rb",
     "spec/git_storyid_spec.rb",
     "spec/spec_helper.rb"
   ]
-  s.homepage = "http://github.com/bogdan/git-storyid"
-  s.licenses = ["MIT"]
-  s.rubygems_version = "2.4.7"
-  s.summary = "Attach commits to pivotal stories"
+  s.homepage = "http://github.com/bogdan/git-storyid".freeze
+  s.licenses = ["MIT".freeze]
+  s.rubygems_version = "2.6.7".freeze
+  s.summary = "Attach commits to pivotal stories".freeze
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     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<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>, [">= 0"])
-      s.add_development_dependency(%q<hashie>, [">= 0"])
+      s.add_runtime_dependency(%q<pivotal-tracker>.freeze, [">= 0"])
+      s.add_runtime_dependency(%q<jira-ruby>.freeze, [">= 0"])
+      s.add_development_dependency(%q<webmock>.freeze, [">= 0"])
+      s.add_development_dependency(%q<debugger>.freeze, [">= 0"])
+      s.add_development_dependency(%q<mocha>.freeze, [">= 0"])
+      s.add_development_dependency(%q<rspec>.freeze, [">= 0"])
+      s.add_development_dependency(%q<jeweler>.freeze, [">= 0"])
+      s.add_development_dependency(%q<hashie>.freeze, [">= 0"])
+      s.add_development_dependency(%q<pry-byebug>.freeze, [">= 0"])
+      s.add_development_dependency(%q<http_logger>.freeze, [">= 0"])
     else
-      s.add_dependency(%q<pivotal-tracker>, [">= 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>, [">= 0"])
-      s.add_dependency(%q<hashie>, [">= 0"])
+      s.add_dependency(%q<pivotal-tracker>.freeze, [">= 0"])
+      s.add_dependency(%q<jira-ruby>.freeze, [">= 0"])
+      s.add_dependency(%q<webmock>.freeze, [">= 0"])
+      s.add_dependency(%q<debugger>.freeze, [">= 0"])
+      s.add_dependency(%q<mocha>.freeze, [">= 0"])
+      s.add_dependency(%q<rspec>.freeze, [">= 0"])
+      s.add_dependency(%q<jeweler>.freeze, [">= 0"])
+      s.add_dependency(%q<hashie>.freeze, [">= 0"])
+      s.add_dependency(%q<pry-byebug>.freeze, [">= 0"])
+      s.add_dependency(%q<http_logger>.freeze, [">= 0"])
     end
   else
-    s.add_dependency(%q<pivotal-tracker>, [">= 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>, [">= 0"])
-    s.add_dependency(%q<hashie>, [">= 0"])
+    s.add_dependency(%q<pivotal-tracker>.freeze, [">= 0"])
+    s.add_dependency(%q<jira-ruby>.freeze, [">= 0"])
+    s.add_dependency(%q<webmock>.freeze, [">= 0"])
+    s.add_dependency(%q<debugger>.freeze, [">= 0"])
+    s.add_dependency(%q<mocha>.freeze, [">= 0"])
+    s.add_dependency(%q<rspec>.freeze, [">= 0"])
+    s.add_dependency(%q<jeweler>.freeze, [">= 0"])
+    s.add_dependency(%q<hashie>.freeze, [">= 0"])
+    s.add_dependency(%q<pry-byebug>.freeze, [">= 0"])
+    s.add_dependency(%q<http_logger>.freeze, [">= 0"])
   end
 end
 

data/lib/git_storyid.rb

@@ -1,8 +1,8 @@
 require "readline"
 require "optparse"
-require "pivotal_tracker"
 require "yaml"
 require "open3"
+require 'io/console'
 
 class GitStoryid
 
@@ -10,7 +10,17 @@ class GitStoryid
     new(*args).run
   end
 
+  def self.output(message)
+    puts message
+  end
+
+  def output(message)
+    self.class.output(message)
+  end
+
+
   def initialize(*arguments)
+    @tracker = Configuration.build
     @git_options = []
     parser = OptionParser.new do |opts|
       opts.banner = "Do git commit with information from pivotal story"
@@ -28,50 +38,43 @@ class GitStoryid
 
     unless arguments.empty?
       @stories = arguments.map do |argument|
-        Configuration.project.stories.find(argument)
+        @tracker.find_story_by_id(argument)
       end
     end
   end
 
-  def all_stories
-    @all_stories ||= Configuration.project.stories.all(
-      :owner => Configuration.me,
-      :state => %w(started finished delivered),
-      :limit => 30
-    )
-  end
-
   def readline_stories_if_not_present
     if !@stories || @stories.empty?
       quit_if_no_stories
       output stories_menu
       @stories = readline_story_ids.map do |index|
-        if index > 1_000_000
-          # Consider it a direct story id
-          Configuration.project.stories.find(index)
-        else
-          all_stories[index - 1] || (quit("Story index #{index} not found."))
-        end
+        fetch_story(index) || quit("Story #{index} was not found.")
       end
     end
   rescue RefetchStories
-    @all_stories = nil
+    @tracker.reset
+    @stories = nil
     readline_stories_if_not_present
   end
 
-  def output(message)
-    puts message
+  def fetch_story(index)
+    if (1..100).include?(index.to_i)
+      @tracker.all_stories[index.to_i - 1]
+    else
+      # Consider it a direct story id
+      @tracker.find_story_by_id(index)
+    end
   end
 
   def quit_if_no_stories
-    if all_stories.empty?
+    if @tracker.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|
+    @tracker.all_stories.each_with_index do |story, index|
       result << "[#{index + 1}] #{story.name}\n"
     end
     result << "\n"
@@ -86,8 +89,11 @@ class GitStoryid
     ids = input.split(/\s*,\s*/).reject do |string|
       string.empty?
     end
-    quit("Cancelling.") if ids.empty?
-    ids.map {|id| id.to_i }
+    if ids.empty?
+      quit("Cancelling.")
+    else
+      ids
+    end
   end
 
   def readline
@@ -118,7 +124,7 @@ class GitStoryid
       message += @custom_message.to_s + "\n\n"
     end
     message += @stories.map do |story|
-      "#{story.story_type.capitalize}: " + story.name.strip
+      "#{story.type.capitalize}: " + story.name.strip
     end.join("\n\n")
     message
   end
@@ -126,7 +132,7 @@ class GitStoryid
   def finish_story_prefix(story)
     return "Delivers " if @deliver_stories
     return "" unless @finish_stories
-    story.story_type == "bug" ? "Fixes " : "Finishes "
+    story.type == "bug" ? "Fixes " : "Finishes "
   end
 
   def execute(*args)
@@ -139,111 +145,186 @@ class GitStoryid
     end
   end
 
+  class Configuration
+
+    def self.build
+      load_config
+      ensure_full_config
+      TRACKER_CONFIG[engine][:class].new(@config)
+    end
 
-  module Configuration
     class << self
 
-    def config=(config)
-      @config = config
+      def load_config
+        @config ||= load_config_from
+      end
+
+      def engine
+        e = @config[:engine]
+        e ? e.to_sym : nil
+      end
+
+      def ensure_full_config
+        @config[:engine] = read_configuration_value("Engine (pivotal/jira)") unless engine
+        tracker_config = TRACKER_CONFIG[engine]
+
+        return if tracker_config && @config.keys.sort == (tracker_config[:options].keys + [:engine]).sort
+
+        tracker_config[:options].each do |key, label|
+          @config[key] = read_configuration_value(label, key == :password)
+        end
+
+        File.open(project_config_path, "w") do |file|
+          file.write YAML.dump(@config)
+        end
+        output "Writing config to #{project_config_path}"
+      end
+
+      def read_configuration_value(label, hidden = false)
+        label = "#{label}: "
+        if hidden
+          print label
+          password = STDIN.noecho(&:gets).chomp
+          puts ''
+          password
+        else
+          Readline.readline(label, true)
+        end
+      end
+
+      def load_config_from
+        return {} unless project_config_path
+        if File.exists?(project_config_path)
+          YAML.load(File.read(project_config_path)) || {}
+        else
+          {}
+        end
+      end
+
+      def project_config_path
+        @project_config_path ||= find_project_config
+      end
+      def find_project_config
+        dirs = File.split(Dir.pwd)
+        until dirs.empty? || File.exists?(File.join(dirs, FILENAME))
+          dirs.pop
+        end
+        unless dirs.empty?
+          File.join(dirs, FILENAME)
+        else
+          File.join(Dir.pwd, FILENAME)
+        end
+      end
     end
 
-    def read
-      return if @loaded
-      load_config
-      ensure_full_config
+    def initialize(config)
+      @config = config
       setup_api_client
-      @loaded = true
     end
 
-    def load_config
-      @config ||= {}
-      @config.merge!(load_config_from(global_config_path))
-      @project_config = load_config_from(project_config_path)
-      @config.merge!(@project_config)
+    def all_stories
+      @all_stories ||= fetch_all_stories.map do |story|
+        serialize_issue(story)
+      end
     end
 
+    def reset
+      @all_stories = nil
+    end
+
+    def self.output(message)
+      GitStoryid.output(message)
+    end
+
+
+    FILENAME = %w(.git-storyid)
+
+  end
+
+  class SerializedIssue < Struct.new(:id, :type, :name)
+  end
+  class PivotalConfiguration < Configuration
+
     def setup_api_client
+      require "pivotal_tracker"
       PivotalTracker::Client.token = @config['api_token']
-      PivotalTracker::Client.use_ssl = @config['use_ssl'] ? @config['use_ssl'] : false
-    end
-
-    def ensure_full_config
-      changed = false
-      {
-        "api_token" => "Api token (https://www.pivotaltracker.com/profile)",
-        "use_ssl" => "Use SSL (y/n)",
-        "me" => "Your pivotal initials (e.g. BG)",
-        "project_id" => "Project ID"
-      }.each do |key, label|
-        if @config[key].nil?
-          changed = true
-          value = Readline.readline("#{label}: ", true)
-          @project_config[key]  = format_config_value(value)
-        end
-      end
-      if changed
-        File.open("./.pivotalrc", "w") do |file|
-          file.write YAML.dump(@project_config)
-        end
-        @config.merge!(@project_config)
-        #output "Writing config to .pivotalrc"
-      end
+      PivotalTracker::Client.use_ssl = true
     end
 
-    def format_config_value(value)
-      case value
-      when "y"
-        true
-      when "n"
-        false
-      else
-        value
-      end
+    def me
+      @me ||= @config['me']
     end
 
-    def load_config_from(path)
-      return {} unless path
-      file = File.join path,'.pivotalrc'
-      if File.exists?(file)
-        YAML.load(File.read(file)) || {}
-      else
-        {}
-      end
+    def fetch_all_stories
+      project.stories.all(
+        :owner => me,
+        :state => %w(started finished delivered),
+        :limit => 30
+      )
     end
 
+    def find_story_by_id(id)
+      serialize_issue(@tracker.project.stories.find(id))
+    end
+
+    def serialize_issue(issue)
+      SerializedIssue.new(issue.id, issue.story_type, issue.name)
+    end
+
+    protected
     def project
-      read
       @project ||= PivotalTracker::Project.find(@config['project_id'])
     end
 
-    def me
-      read
-      @me ||= @config['me']
+  end
+
+
+  class JiraConfiguration < Configuration
+
+    def initialize(config)
+      super(config)
     end
 
-    def global_config_path
-      @global_config_path ||= File.expand_path('~')
+    def setup_api_client
+      require 'jira'
+      @client ||= JIRA::Client.new(
+        :username     => username,
+        :password     => @config[:password],
+        :site         => @config[:site],
+        :context_path => '',
+        :auth_type    => :basic,
+      )
     end
 
-    def project_config_path
-      @project_config_path ||= find_project_config
+    def client
+      @client
     end
 
+    def username
+      @username ||= @config[:username]
+    end
 
-    private
+    def fetch_all_stories
+      client.Issue.jql("assignee=#{username} and status not in (done) and project = #{@config[:project_id]}")
+    end
 
-    def find_project_config
-      dirs = File.split(Dir.pwd)
-      until dirs.empty? || File.exists?(File.join(dirs, '.pivotalrc'))
-        dirs.pop
+    def find_story_by_id(key)
+      if key.to_i.to_s == key.to_s # no project_id in key
+        key = [@config[:project_id], key].join("-")
       end
-      if dirs.empty? || File.join(dirs, '.pivotalrc')==global_config_path
+      serialize_issue(client.Issue.find(key))
+    rescue JIRA::HTTPError => e
+      if e.code.to_i == 404
         nil
       else
-        File.join(dirs)
+        raise e
       end
     end
+
+    def serialize_issue(issue)
+      SerializedIssue.new(issue.key, issue.issuetype.name, issue.summary)
     end
+
   end
 
   class Error < StandardError
@@ -251,4 +332,26 @@ class GitStoryid
 
   class RefetchStories < StandardError
   end
+
+  TRACKER_CONFIG = {
+    pivotal: {
+      class: PivotalConfiguration,
+      options: {
+        :api_token => "Api token (https://www.pivotaltracker.com/profile)",
+        :me => "Your pivotal initials (e.g. BG)",
+        :project_id => "Project ID",
+      },
+    },
+    jira: {
+      class: JiraConfiguration,
+      options: {
+        :site         => 'Site URL',
+        project_id: "Project ID",
+        :username     => 'Username',
+        :password     => 'Password',
+      }
+    }
+  }
+
+
 end

data/spec/git_storyid/jira_spec.rb

@@ -0,0 +1,108 @@
+
+require "spec_helper"
+require "fileutils"
+
+describe GitStoryid do
+
+  let(:commands) { []}
+
+  def run(*args)
+    GitStoryid.run(*args)
+  end
+
+  def should_quit_with(expected)
+    actual = nil
+    GitStoryid.send(:define_method, :quit) do |message|
+      actual = message
+    end
+    yield
+    actual.should_not be_nil
+    actual.should == expected
+
+  end
+
+
+  describe "Pivotal" do
+
+    before(:each) do
+
+      GitStoryid::Configuration.stubs(:load_config_from).
+        returns(
+          "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(: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::PivotalConfiguration.any_instance.stubs(:fetch_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
+  end
+end

data/spec/git_storyid_spec.rb

@@ -9,26 +9,35 @@ describe GitStoryid do
     GitStoryid.run(*args)
   end
 
+  class ForceQuit < StandardError
+  end
+
   def should_quit_with(expected)
     actual = nil
     GitStoryid.send(:define_method, :quit) do |message|
       actual = message
+      raise ForceQuit
     end
     yield
+    true.should eq(false)
+  rescue ForceQuit
     actual.should_not be_nil
     actual.should == expected
 
   end
 
 
+  describe "Pivotal" do
+
   before(:each) do
-    
-    GitStoryid::Configuration.config = {
-      "api_token" => "a2b4e",
-      "use_ssl" => false,
-      "me" => "BG",
-      "project_id" => "1234"
-    }
+
+    GitStoryid::Configuration.stubs(:load_config_from).
+      returns(
+        engine: "pivotal",
+        api_token: "a2b4e",
+        me: "BG",
+        project_id: "1234",
+    )
     commands = self.commands
     GitStoryid.send(:define_method, :execute) do |*args|
       commands << args
@@ -37,25 +46,7 @@ describe GitStoryid do
     GitStoryid.any_instance.stubs(:ensure_changes_stashed!).returns(true)
       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([
+      GitStoryid::PivotalConfiguration.any_instance.stubs(:fetch_all_stories).returns([
         Hashie::Mash.new(
           :deadline => nil,
           :labels => "paypal",
@@ -147,6 +138,7 @@ EOI
   end
 
 
+  end
 
 
 end

data/spec/spec_helper.rb

@@ -3,6 +3,8 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'rspec'
 require "webmock"
 require "hashie"
+require "pivotal_tracker"
+require 'jira-ruby'
 require 'git-storyid'
 
 # Requires supporting files with custom matchers and macros, etc,
@@ -13,5 +15,5 @@ WebMock.disable_net_connect!
 
 RSpec.configure do |config|
   config.mock_with :mocha
-  
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-storyid
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.4.0
 platform: ruby
 authors:
 - Bogdan Gusiev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-13 00:00:00.000000000 Z
+date: 2017-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pivotal-tracker
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: jira-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +122,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: http_logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Helps include pivotal story id and description in commit
 email: agresso@gmail.com
 executables:
@@ -129,6 +171,7 @@ files:
 - git-storyid.gemspec
 - lib/git-storyid.rb
 - lib/git_storyid.rb
+- spec/git_storyid/jira_spec.rb
 - spec/git_storyid_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/bogdan/git-storyid
@@ -151,7 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: Attach commits to pivotal stories