pivotal_tracker_pr 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd1f80ed93c9ef919f48b100415178a80153bcae
-  data.tar.gz: aa7e9925ad62380fe3d26a503c3d3f56b2777877
+  metadata.gz: 005c323ab54a3990810c73c1ed29ab41435034f7
+  data.tar.gz: 25bc2261cad1ca9c0d17a4f0d2b6bdd5921649b4
 SHA512:
-  metadata.gz: b59678639def419950f13b2c8ae7b3617a65742b423365bbf6fc7b912433f603f218e90335f3123f79932c80162ec8aa646f33106d79a15dfee6f713d9b6a644
-  data.tar.gz: 913aca7d0de455de8324281734d07e0dc551633f334b56a01691dd60cf6693ec3d8f0a083d26fa6ce17fb635e70cc7b746bcdba0d9e356bf12605b71e3ba1d0c
+  metadata.gz: 7de211db0144a54bfa9682eaf285c8fc8726eeba126d59ca93135c076953de8a563a39787cb7b0570c412ebe910d615be11fc76bb8c1b461939e7ece0499972e
+  data.tar.gz: a29ffc6b17011871c8471d443b546b8a803dd5248609315824bebfc41dcc40d5f3051e6b9410554a5b42819ff8853c607d90f9e455b9ffe7401285717fc2d4b9

data/README.md

@@ -1,6 +1,6 @@
-[![Build Status](https://travis-ci.org/blueplanet/pivotal_tracker_pr.svg?branch=master)](https://travis-ci.org/blueplanet/pivotal_tracker_pr)
+# PivotalTrackerPr [![Gem Version](https://badge.fury.io/rb/pivotal_tracker_pr.svg)](https://badge.fury.io/rb/pivotal_tracker_pr) [![Build Status](https://travis-ci.org/blueplanet/pivotal_tracker_pr.svg?branch=master)](https://travis-ci.org/blueplanet/pivotal_tracker_pr) [![Coverage Status](https://coveralls.io/repos/github/blueplanet/pivotal_tracker_pr/badge.svg?branch=master)](https://coveralls.io/github/blueplanet/pivotal_tracker_pr?branch=master) [![Code Climate](https://codeclimate.com/github/blueplanet/pivotal_tracker_pr/badges/gpa.svg)](https://codeclimate.com/github/blueplanet/pivotal_tracker_pr)
+
 
-# PivotalTrackerPr
 - `PivotalTracker`のストリーIDとストリー名を取得し、カレントブランチの`PullRequest`を作成する
 
 ## インストール

data/lib/pivotal_tracker_pr/cli.rb

@@ -1,26 +1,26 @@
 require "pivotal_tracker_pr"
+require 'pivotal_tracker_pr/pivotal_tracker_api'
+require 'pivotal_tracker_pr/pull_request_writer'
 require 'json'
 require 'net/http'
 require 'thor'
 
 module PivotalTrackerPr
-  PULL_REQUEST_MESSAGE = 'PULLREQ_EDITMSG'.freeze
-  MESSAGE_TEMPLATE = 'PULLREQ_MSG_TEMPLATE'.freeze
-
   class CLI < Thor
     default_command :create
     desc 'create [STORY_ID]', 'Create pull request use story id / story name of PivotalTracker.'
     def create(story_id = nil)
+      story_id = story_id[1..-1] if story_id && story_id[0] == '#'
       story_id ||= parse_story_id
       if story_id
         say "story id : #{story_id}", :green
 
         check_env_vars
 
-        story_name = get_story_name(story_id)
+        story_name = PivotalTrackerApi.get_story_name(story_id)
         if story_name
           say "Story name : #{story_name}", :green
-          write_pull_request_template story_id, story_name
+          PullRequestWriter.new(story_id, story_name).write
         end
       end
 
@@ -35,31 +35,6 @@ module PivotalTrackerPr
       $1
     end
 
-    def get_story_name(story_id)
-      url = URI.parse("https://www.pivotaltracker.com/services/v5/projects/#{ENV['PT_PROJECT_ID']}/stories/#{story_id}")
-      https = Net::HTTP.new(url.host, 443)
-      https.use_ssl = true
-      https.open_timeout = 5
-      https.read_timeout = 5
-
-      response = https.get(url.path, 'X-TrackerToken' => ENV['PT_TOKEN'])
-      case response
-      when Net::HTTPSuccess
-        JSON(response.body)['name']
-      else
-        say 'Please check story id for following message:', :red
-        say JSON(response.body)['error'] || response.body, :red
-
-        nil
-      end
-    rescue Timeout::Error
-      say 'Timeout::Error, Please check network', :red
-      nil
-    rescue => e
-      say e.message, :red
-      nil
-    end
-
     def check_env_vars
       unless ENV['PT_TOKEN']
         say 'Please export PT_TOKEN', :red
@@ -71,41 +46,5 @@ module PivotalTrackerPr
         exit 1
       end
     end
-
-    def write_pull_request_template(story_id, story_name)
-      message_context =
-        if File.exists?(message_template_path)
-          message_from_template(story_id, story_name)
-        else
-          default_message story_id, story_name
-        end
-
-      open(pull_request_message, 'w') { |file| file.puts message_context }
-    end
-
-    def message_template_path
-      File.join(Dir.pwd, '.git', MESSAGE_TEMPLATE)
-    end
-
-    def message_from_template(story_id, story_name)
-      template_content = File.open(message_template_path).read
-      template_content.gsub('{{STORY_ID}}', story_id).gsub('{{STORY_NAME}}', story_name).gsub('{{STORY_LINK}}', story_link(story_id))
-    end
-
-    def pull_request_message
-      File.join(Dir.pwd, '.git', PULL_REQUEST_MESSAGE)
-    end
-
-    def default_message(story_id, story_name)
-      <<-EOF
-[fixed ##{story_id}]#{story_name}
-
-#{story_link story_id}
-      EOF
-    end
-
-    def story_link(story_id)
-      "https://www.pivotaltracker.com/story/show/#{story_id}"
-    end
   end
 end

data/lib/pivotal_tracker_pr/pivotal_tracker_api.rb

@@ -0,0 +1,31 @@
+module PivotalTrackerPr
+  class PivotalTrackerApi
+    STORY_URL_PREFIX = 'https://www.pivotaltracker.com/services/v5/projects'.freeze
+
+    def self.get_story_name(story_id)
+      url = URI.parse(File.join(STORY_URL_PREFIX, ENV['PT_PROJECT_ID'], 'stories', story_id.to_s))
+
+      https = Net::HTTP.new(url.host, 443)
+      https.use_ssl = true
+      https.open_timeout = 5
+      https.read_timeout = 5
+
+      response = https.get(url.path, 'X-TrackerToken' => ENV['PT_TOKEN'])
+      case response
+      when Net::HTTPSuccess
+        JSON(response.body)['name']
+      else
+        puts 'Please check story id for following message:'
+        puts JSON(response.body)['error'] || response.body
+
+        nil
+      end
+    rescue Timeout::Error
+      puts 'Timeout::Error, Please check network', :red
+      nil
+    rescue => e
+      puts e.message
+      nil
+    end
+  end
+end

data/lib/pivotal_tracker_pr/pull_request_writer.rb

@@ -0,0 +1,47 @@
+module PivotalTrackerPr
+  class PullRequestWriter
+    PULL_REQUEST_MESSAGE = 'PULLREQ_EDITMSG'.freeze
+    MESSAGE_TEMPLATE = 'PULLREQ_MSG_TEMPLATE'.freeze
+
+    def initialize(story_id, story_name)
+      @story_id = story_id
+      @story_name = story_name
+    end
+
+    def write
+      message_context =
+        if File.exist?(message_template_path)
+          message_from_template(@story_id, @story_name)
+        else
+          default_message @story_id, @story_name
+        end
+
+      open(pull_request_message, 'w') { |file| file.puts message_context }
+    end
+
+    def message_template_path
+      File.join(Dir.pwd, '.git', MESSAGE_TEMPLATE)
+    end
+
+    def message_from_template(story_id, story_name)
+      template_content = File.open(message_template_path).read
+      template_content.gsub('{{STORY_ID}}', story_id).gsub('{{STORY_NAME}}', story_name).gsub('{{STORY_LINK}}', story_link(story_id))
+    end
+
+    def pull_request_message
+      File.join(Dir.pwd, '.git', PULL_REQUEST_MESSAGE)
+    end
+
+    def default_message(story_id, story_name)
+      <<-EOF
+[fixed ##{story_id}]#{story_name}
+
+#{story_link story_id}
+      EOF
+    end
+
+    def story_link(story_id)
+      "https://www.pivotaltracker.com/story/show/#{story_id}"
+    end
+  end
+end

data/lib/pivotal_tracker_pr/version.rb

@@ -1,3 +1,3 @@
 module PivotalTrackerPr
-  VERSION = "0.3.6"
+  VERSION = "0.3.7"
 end

data/pivotal_tracker_pr.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "coveralls"
   spec.add_dependency 'thor'
   spec.add_dependency 'hub'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pivotal_tracker_pr
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - blueplanet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-17 00:00:00.000000000 Z
+date: 2016-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  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: thor
   requirement: !ruby/object:Gem::Requirement
@@ -101,6 +115,8 @@ files:
 - bin/setup
 - lib/pivotal_tracker_pr.rb
 - lib/pivotal_tracker_pr/cli.rb
+- lib/pivotal_tracker_pr/pivotal_tracker_api.rb
+- lib/pivotal_tracker_pr/pull_request_writer.rb
 - lib/pivotal_tracker_pr/version.rb
 - pivotal_tracker_pr.gemspec
 homepage: https://github.com/blueplanet/pivotal_tracker_pr