git-storyid 0.3.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ea0c96c0cc6afc52210c376d0c46ed4e58ce27f4
-  data.tar.gz: 958cd9d0871e7a71dd45ae14f3585bcd6c3236d1
+SHA256:
+  metadata.gz: bc54e25bc8d5baee1ad92cd40a911de1bc2182eb1b3295ada65d6590b8d0c081
+  data.tar.gz: d0c1b93785bd05d31bcafa88fe4224bbf159d195231f2778d867c904e6b87511
 SHA512:
-  metadata.gz: 330859df25358888f7f78bf48b003d9abe3003ac291e7c9bbd8ed2c5a0a9eabc2227b8a5c05dd3ba07c828f5fca8d0155fb22ef40b1f037533b59528f28ae098
-  data.tar.gz: 49ddd88705a4466a6facf5bf9c48e9bf94e38c1269fe8b5dd5d4466212f7ce26044a4997a0e2368fed1604d02a78fcda0d5b1cc5975fe2a7342250e4c7e5f2d5
+  metadata.gz: bce50d473b0d9ac819576ce6d502c86b5c699ca5d567189e06f80cae4d0d81a9973f532e47b103f4b5c5ce450544ee6851cf4c9907d43f089f0b85ca6b4e89be
+  data.tar.gz: cf3213b24382d62e1398e6b26021aed52a253970c6b440de3f181e9267d7583372235cd474c102772bc49362cd1e49a911901c9a6faece991c521d51fea3fcfe

data/Gemfile

@@ -1,11 +1,15 @@
 source "http://rubygems.org"
 
-gem "pivotal-tracker"
+gem "tracker_api"
+gem "jira-ruby"
+
 group :development do
   gem "webmock"
   gem "debugger", :platform => "ruby_19"
   gem "mocha"
   gem "rspec"
-  gem "jeweler"
+  gem "juwelier", github: 'flajann2/juwelier'
   gem "hashie"
+  gem "pry-byebug", require: false
+  gem "http_logger"
 end

data/Gemfile.lock

@@ -1,59 +1,158 @@
+GIT
+  remote: git://github.com/flajann2/juwelier.git
+  revision: de59d5a2ddea00c1f18957ab62129c1c141acce1
+  specs:
+    juwelier (2.4.9)
+      builder
+      bundler
+      git
+      github_api
+      highline
+      kamelcase (~> 0)
+      nokogiri
+      psych
+      rake
+      rdoc
+      semver2
+
 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 (6.0.3.2)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+      zeitwerk (~> 2.2, >= 2.2.2)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    atlassian-jwt (0.2.0)
+      jwt (~> 2.1.0)
+    axiom-types (0.1.1)
+      descendants_tracker (~> 0.0.4)
+      ice_nine (~> 0.11.0)
+      thread_safe (~> 0.3, >= 0.3.1)
+    builder (3.2.4)
+    byebug (11.1.3)
+    coderay (1.1.3)
+    coercible (1.0.0)
+      descendants_tracker (~> 0.0.1)
+    columnize (0.9.0)
+    concurrent-ruby (1.1.7)
+    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)
-      git (>= 1.2.5)
-      rake
-      rdoc
-    json (1.8.1)
-    libxml-ruby (2.7.0)
-    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
-      builder
-      happymapper (>= 0.3.2)
-      happymapper (>= 0.3.2)
-      nokogiri (>= 1.4.3)
-      nokogiri (~> 1.4)
-      rest-client (~> 1.6.0)
-      rest-client (~> 1.6.0)
-    rake (10.2.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)
+      debugger-linecache (~> 1.2.0)
+      debugger-ruby_core_source (~> 1.3.5)
+    debugger-linecache (1.2.0)
+    debugger-ruby_core_source (1.3.8)
+    declarative (0.0.20)
+    declarative-option (0.1.0)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
+    diff-lcs (1.4.4)
+    equalizer (0.0.11)
+    excon (0.76.0)
+    faraday (1.0.1)
+      multipart-post (>= 1.2, < 3)
+    faraday_middleware (1.0.0)
+      faraday (~> 1.0)
+    git (1.7.0)
+      rchardet (~> 1.8)
+    github_api (0.19.0)
+      addressable (~> 2.4)
+      descendants_tracker (~> 0.0.4)
+      faraday (>= 0.8, < 2)
+      hashie (~> 3.5, >= 3.5.2)
+      oauth2 (~> 1.0)
+    hashdiff (1.0.1)
+    hashie (3.6.0)
+    highline (2.0.3)
+    http_logger (0.6.0)
+    i18n (1.8.5)
+      concurrent-ruby (~> 1.0)
+    ice_nine (0.11.2)
+    jira-ruby (2.1.3)
+      activesupport
+      atlassian-jwt
+      multipart-post
+      oauth (~> 0.5, >= 0.5.0)
+    jwt (2.1.0)
+    kamelcase (0.0.2)
+      semver2 (~> 3)
+    method_source (1.0.0)
+    mimemagic (0.3.5)
+    mini_portile2 (2.4.0)
+    minitest (5.14.1)
+    mocha (1.11.2)
+    multi_json (1.15.0)
+    multi_xml (0.6.0)
+    multipart-post (2.1.1)
+    nokogiri (1.10.10)
+      mini_portile2 (~> 2.4.0)
+    oauth (0.5.4)
+    oauth2 (1.4.4)
+      faraday (>= 0.8, < 2.0)
+      jwt (>= 1.0, < 3.0)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (>= 1.2, < 3)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    pry-byebug (3.9.0)
+      byebug (~> 11.0)
+      pry (~> 0.13.0)
+    psych (3.2.0)
+    public_suffix (4.0.5)
+    rack (2.2.3)
+    rake (13.0.1)
+    rchardet (1.8.0)
+    rdoc (6.2.1)
+    representable (3.0.4)
+      declarative (< 0.1.0)
+      declarative-option (< 0.2.0)
+      uber (< 0.2.0)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.3)
+    safe_yaml (1.0.5)
+    semver2 (3.4.2)
+    thread_safe (0.3.6)
+    tracker_api (1.11.0)
+      addressable
+      equalizer
+      excon
+      faraday
+      faraday_middleware
+      mimemagic
+      multi_json
+      representable
+      virtus
+    tzinfo (1.2.7)
+      thread_safe (~> 0.1)
+    uber (0.1.0)
+    virtus (1.0.5)
+      axiom-types (~> 0.1)
+      coercible (~> 1.0)
+      descendants_tracker (~> 0.0, >= 0.0.3)
+      equalizer (~> 0.0, >= 0.0.9)
+    webmock (3.8.3)
+      addressable (>= 2.3.6)
+      crack (>= 0.3.2)
+      hashdiff (>= 0.4.0, < 2.0.0)
+    zeitwerk (2.4.0)
 
 PLATFORMS
   ruby
@@ -61,8 +160,14 @@ PLATFORMS
 DEPENDENCIES
   debugger
   hashie
-  jeweler
+  http_logger
+  jira-ruby
+  juwelier!
   mocha
-  pivotal-tracker
+  pry-byebug
   rspec
+  tracker_api
   webmock
+
+BUNDLED WITH
+   1.17.3

data/README.md

@@ -47,3 +47,11 @@ Feature: Tag campaign insertion points and
 campaigns with an identifier, 
 so only campaigns with matching identifier will get shown
 ```
+
+## Supported options
+
+```
+-m, --message [MESSAGE]          Add addional MESSAGE to comit
+-f, --finish                     Specify that this commit finishes a story or fixes a bug
+-d, --deliver                    Specify that this commit delivers a story or a bug
+```

data/Rakefile

@@ -11,8 +11,8 @@ rescue Bundler::BundlerError => e
 end
 require 'rake'
 
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
+require 'juwelier'
+Juwelier::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
   gem.name = "git-storyid"
   gem.executables = ['git-storyid']
@@ -24,7 +24,7 @@ Jeweler::Tasks.new do |gem|
   gem.authors = ["Bogdan Gusiev"]
   # dependencies defined in Gemfile
 end
-Jeweler::RubygemsDotOrgTasks.new
+Juwelier::RubygemsDotOrgTasks.new
 
 require 'rspec/core'
 require 'rspec/core/rake_task'

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.5.0

data/git-storyid.gemspec

@@ -1,20 +1,20 @@
-# Generated by jeweler
+# Generated by juwelier
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: git-storyid 0.3.2 ruby lib
+# stub: git-storyid 0.5.0 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = "git-storyid"
-  s.version = "0.3.2"
+  s.name = "git-storyid".freeze
+  s.version = "0.5.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 = "2014-04-14"
-  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 = "2020-08-31"
+  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.2.2"
-  s.summary = "Attach commits to pivotal stories"
+  s.homepage = "http://github.com/bogdan/git-storyid".freeze
+  s.licenses = ["MIT".freeze]
+  s.rubygems_version = "3.0.8".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<tracker_api>.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<juwelier>.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<tracker_api>.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<juwelier>.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<tracker_api>.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<juwelier>.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,54 +10,71 @@ 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"
       opts.on("-m", "--message [MESSAGE]", "Add addional MESSAGE to comit") do |custom_message|
         @custom_message = custom_message
       end
+      opts.on("-f", "--finish", "Specify that this commit finishes a story or fixes a bug") do
+        @finish_stories = true
+      end
+      opts.on("-d", "--deliver", "Specify that this commit delivers a story or a bug") do
+        @deliver_stories = true
+      end
     end
     parser.parse!(arguments)
 
     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|
-        all_stories[index - 1] || (quit("Story index #{index} not found."))
+        fetch_story(index) || quit("Story #{index} was not found.")
       end
     end
+  rescue RefetchStories
+    @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"
@@ -65,15 +82,22 @@ class GitStoryid
   end
 
   def readline_story_ids
-    ids = readline.split(/\s*,\s*/).reject do |string|
+    input = readline
+    if input =~ /\A\s*re?f?r?e?s?h?\s*\z/
+      raise RefetchStories
+    end
+    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
-    Readline.readline("Indexes(csv): ", true)
+    Readline.readline("Indexes: ", true)
   end
 
   def quit(message)
@@ -92,15 +116,25 @@ class GitStoryid
   end
 
   def build_commit_message
-    message = ("[#{@stories.map { |s| "\##{s.id}"}.join(", ")}]").rjust 12
-    message += ' '
+    message = @stories.map do |story|
+      "#{finish_story_prefix(story)}##{story.id}"
+    end.join(", ")
+    message = "[#{message}] "
     if @custom_message && !@custom_message.empty?
       message += @custom_message.to_s + "\n\n"
     end
-    message += @stories.map {|s| "#{s.story_type.capitalize}: " + s.name.strip}.join("\n\n")
+    message += @stories.map do |story|
+      "#{story.type.capitalize}: " + story.name.strip
+    end.join("\n\n")
     message
   end
 
+  def finish_story_prefix(story)
+    return "Delivers " if @deliver_stories
+    return "" unless @finish_stories
+    story.type == "bug" ? "Fixes " : "Finishes "
+  end
+
   def execute(*args)
     Open3.popen3(*args) {|i, o| return o.read }
   end
@@ -111,113 +145,213 @@ class GitStoryid
     end
   end
 
+  class Configuration
 
-  module Configuration
-    class << self
-
-    def config=(config)
-      @config = config
-    end
-
-    def read
-      return if @loaded
+    def self.build
       load_config
       ensure_full_config
-      setup_api_client
-      @loaded = true
+      TRACKER_CONFIG[engine][:class].new(@config)
     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)
-    end
+    class << self
 
-    def setup_api_client
-      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)
+      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
-      if changed
-        File.open("./.pivotalrc", "w") do |file|
-          file.write YAML.dump(@project_config)
+
+      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
-        @config.merge!(@project_config)
-        #output "Writing config to .pivotalrc"
       end
-    end
 
-    def format_config_value(value)
-      case value
-      when "y"
-        true
-      when "n"
-        false
-      else
-        value
+      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 load_config_from(path)
-      return {} unless path
-      file = File.join path,'.pivotalrc'
-      if File.exists?(file)
-        YAML.load(File.read(file)) || {}
-      else 
-        {}
+    def initialize(config)
+      @config = config
+      setup_api_client
+    end
+
+    def all_stories
+      @all_stories ||= fetch_all_stories.map do |story|
+        serialize_issue(story)
       end
     end
 
-    def project
-      read
-      @project ||= PivotalTracker::Project.find(@config['project_id'])
+    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 "tracker_api"
+      @client ||= TrackerApi::Client.new(token: @config[:api_token])
     end
 
     def me
-      read
       @me ||= @config['me']
     end
 
-    def global_config_path
-      @global_config_path ||= File.expand_path('~')
+    def fetch_all_stories
+      project.stories(
+        filter: "mywork:#{me} state:started,finished,delivered",
+        # :owner => me,
+        # :with_state => %w(started finished delivered),
+        :limit => 30
+      )
     end
 
-    def project_config_path
-      @project_config_path ||= find_project_config
+    def find_story_by_id(id)
+      serialize_issue(project.story(id))
     end
 
+    def serialize_issue(issue)
+      SerializedIssue.new(issue.id, issue.story_type, issue.name)
+    end
 
-    private
+    protected
+    def project
+      @project ||= @client.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
+  end
+
+
+  class JiraConfiguration < Configuration
+
+    def initialize(config)
+      super(config)
+    end
+
+    def setup_api_client
+      require 'jira-ruby'
+      @client ||= JIRA::Client.new(
+        :username     => username,
+        :password     => @config[:password],
+        :site         => @config[:site],
+        :context_path => '',
+        :auth_type    => :basic,
+      )
+    end
+
+    def client
+      @client
+    end
+
+    def username
+      @username ||= @config[:username]
+    end
+
+    def fetch_all_stories
+      client.Issue.jql("assignee=#{username} and status not in (done) and project = #{@config[:project_id]}")
+    end
+
+    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
   end
+
+  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",
@@ -102,15 +93,11 @@ describe GitStoryid do
   end
 
   context "when stories exists" do
-    
-    before(:each) do
-
-      GitStoryid.any_instance.stubs(:readline).returns('1')
-    end
 
     it "should commit changes" do
+      GitStoryid.any_instance.stubs(:readline).returns('1')
       run("-m",  'Hello world')
-      commands.should include(["git", "commit", "-m", " [#44647731] Hello world\n\nFeature: Strip Default paypal credentials"])
+      commands.should include(["git", "commit", "-m", "[#44647731] Hello world\n\nFeature: Strip Default paypal credentials"])
     end
 
     it "should render stories menu correctly" do
@@ -120,6 +107,27 @@ describe GitStoryid do
 
 EOI
     end
+
+    it "should commit to multiple stories" do
+      GitStoryid.any_instance.stubs(:readline).returns('1,2')
+      run("-m",  'Hello world')
+      commands.should include(
+        ["git", "commit", "-m",
+          "[#44647731, #44647732] Hello world\n\nFeature: Strip Default paypal credentials\n\nFeature: Require pro paypal account for mass payments"]
+      )
+    end
+
+    it "should support finishing" do
+      GitStoryid.any_instance.stubs(:readline).returns('1')
+      run('-f')
+      commands.should include(["git", "commit", "-m", "[Finishes #44647731] Feature: Strip Default paypal credentials"])
+    end
+
+    it "should support delivering" do
+      GitStoryid.any_instance.stubs(:readline).returns('1')
+      run('-d')
+      commands.should include(["git", "commit", "-m", "[Delivers #44647731] Feature: Strip Default paypal credentials"])
+    end
   end
 
   it "should quit if no stories specified" do
@@ -130,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 "tracker_api"
+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,17 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: git-storyid
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Bogdan Gusiev
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-04-14 00:00:00.000000000 Z
+date: 2020-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: pivotal-tracker
+  name: tracker_api
+  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: jira-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: jeweler
+  name: juwelier
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -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,13 +171,14 @@ 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
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -150,9 +193,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
-signing_key: 
+rubygems_version: 3.0.8
+signing_key:
 specification_version: 4
 summary: Attach commits to pivotal stories
 test_files: []