git-pivotal-tracker-integration 1.3.0 → 1.4.0

data/lib/git-pivotal-tracker-integration/util/shell.rb

@@ -13,9 +13,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "git-pivotal-tracker-integration/util/util"
+require 'git-pivotal-tracker-integration/util/util'
 
-# Utilties for dealing with the shell
+# Utilities for dealing with the shell
 class GitPivotalTrackerIntegration::Util::Shell
 
   # Executes a command
@@ -27,7 +27,7 @@ class GitPivotalTrackerIntegration::Util::Shell
   def self.exec(command, abort_on_failure = true)
     result = `#{command}`
     if $?.exitstatus != 0 && abort_on_failure
-      abort "FAIL"
+      abort 'FAIL'
     end
 
     result

data/lib/git-pivotal-tracker-integration/util/story.rb

@@ -13,11 +13,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "git-pivotal-tracker-integration/util/util"
-require "highline/import"
-require "pivotal-tracker"
+require 'git-pivotal-tracker-integration/util/util'
+require 'highline/import'
+require 'pivotal-tracker'
 
-# Utilties for dealing with +PivotalTracker::Story+s
+# Utilities for dealing with +PivotalTracker::Story+s
 class GitPivotalTrackerIntegration::Util::Story
 
   # Print a human readable version of a story.  This pretty prints the title,
@@ -26,12 +26,12 @@ class GitPivotalTrackerIntegration::Util::Story
   # @param [PivotalTracker::Story] story the story to pretty print
   # @return [void]
   def self.pretty_print(story)
-    print_label @@LABEL_TITLE
+    print_label LABEL_TITLE
     print_value story.name
 
     description = story.description
     if !description.nil? && !description.empty?
-      print_label "Description"
+      print_label 'Description'
       print_value description
     end
 
@@ -54,8 +54,6 @@ class GitPivotalTrackerIntegration::Util::Story
   # @param [Fixnum] limit The number maximum number of stories the user can choose from
   # @return [PivotalTracker::Story] The Pivotal Tracker story selected by the user
   def self.select_story(project, filter = nil, limit = 5)
-    story = nil
-
     if filter =~ /[[:digit:]]/
       story = project.stories.find filter.to_i
     else
@@ -67,39 +65,37 @@ class GitPivotalTrackerIntegration::Util::Story
 
   private
 
-  @@CANDIDATE_STATES = ["rejected", "unstarted", "unscheduled"]
+  CANDIDATE_STATES = %w(rejected unstarted unscheduled).freeze
 
-  @@LABEL_DESCRIPTION = "Description"
+  LABEL_DESCRIPTION = 'Description'.freeze
 
-  @@LABEL_TITLE = "Title"
+  LABEL_TITLE = 'Title'.freeze
 
-  @@LABEL_WIDTH = @@LABEL_DESCRIPTION.length + 2
+  LABEL_WIDTH = (LABEL_DESCRIPTION.length + 2).freeze
 
-  @@CONTENT_WIDTH = HighLine.new.output_cols - @@LABEL_WIDTH
+  CONTENT_WIDTH = (HighLine.new.output_cols - LABEL_WIDTH).freeze
 
   def self.print_label(label)
-    print "%#{@@LABEL_WIDTH}s" % ["#{label}: "]
+    print "%#{LABEL_WIDTH}s" % ["#{label}: "]
   end
 
   def self.print_value(value)
     if value.nil? || value.empty?
-      puts ""
+      puts ''
     else
-      value.scan(/\S.{0,#{@@CONTENT_WIDTH - 2}}\S(?=\s|$)|\S+/).each_with_index do |line, index|
+      value.scan(/\S.{0,#{CONTENT_WIDTH - 2}}\S(?=\s|$)|\S+/).each_with_index do |line, index|
         if index == 0
           puts line
         else
-          puts "%#{@@LABEL_WIDTH}s%s" % ["", line]
+          puts "%#{LABEL_WIDTH}s%s" % ['', line]
         end
       end
     end
   end
 
   def self.find_story(project, type, limit)
-    story = nil
-
     criteria = {
-      :current_state => @@CANDIDATE_STATES,
+      :current_state => CANDIDATE_STATES,
       :limit => limit
     }
     if type
@@ -111,10 +107,10 @@ class GitPivotalTrackerIntegration::Util::Story
       story = candidates[0]
     else
       story = choose do |menu|
-        menu.prompt = "Choose story to start: "
+        menu.prompt = 'Choose story to start: '
 
         candidates.each do |story|
-          name = type ? story.name : "%-7s %s" % [story.story_type.upcase, story.name]
+          name = type ? story.name : '%-7s %s' % [story.story_type.upcase, story.name]
           menu.choice(name) { story }
         end
       end

data/lib/git-pivotal-tracker-integration/util/util.rb

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "git_pivotal_tracker_integration"
+require 'git_pivotal_tracker_integration'
 
 # A module encapsulating utilities for the project
 module GitPivotalTrackerIntegration::Util

data/lib/git-pivotal-tracker-integration/version-update/gradle.rb

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "git-pivotal-tracker-integration/version-update/version_update"
+require 'git-pivotal-tracker-integration/version-update/version_update'
 
 # A version updater for dealing with _typical_ Gradle projects.  This updater
 # assumes that the version of the current project is stored within a
@@ -25,11 +25,11 @@ class GitPivotalTrackerIntegration::VersionUpdate::Gradle
   #
   # @param [String] root The root of the repository
   def initialize(root)
-    @gradle_properties = File.expand_path "gradle.properties", root
+    @gradle_properties = File.expand_path 'gradle.properties', root
 
     if File.exist? @gradle_properties
       groups = nil
-      File.open(@gradle_properties, "r") do |file|
+      File.open(@gradle_properties, 'r') do |file|
         groups = file.read().scan(/version[=:](.*)/)
       end
       @version = groups[0] ? groups[0][0]: nil
@@ -39,7 +39,7 @@ class GitPivotalTrackerIntegration::VersionUpdate::Gradle
   # Whether this updater supports updating this project
   #
   # @return [Boolean] +true+ if a valid version number was found on
-  #   initiialization, +false+ otherwise
+  #   initialization, +false+ otherwise
   def supports?
     !@version.nil?
   end
@@ -58,7 +58,7 @@ class GitPivotalTrackerIntegration::VersionUpdate::Gradle
   def update_version(new_version)
     contents = File.read(@gradle_properties)
     contents = contents.gsub(/(version[=:])#{@version}/, "\\1#{new_version}")
-    File.open(@gradle_properties, "w") { |file| file.write(contents) }
+    File.open(@gradle_properties, 'w') { |file| file.write(contents) }
   end
 
 end

data/lib/git-pivotal-tracker-integration/version-update/version_update.rb

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "git_pivotal_tracker_integration"
+require 'git_pivotal_tracker_integration'
 
 # A module encapsulating version update implementations
 module GitPivotalTrackerIntegration::VersionUpdate

data/spec/git-pivotal-tracker-integration/command/base_spec.rb

@@ -13,10 +13,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "spec_helper"
-require "git-pivotal-tracker-integration/command/base"
-require "git-pivotal-tracker-integration/command/configuration"
-require "git-pivotal-tracker-integration/util/git"
+require 'spec_helper'
+require 'git-pivotal-tracker-integration/command/base'
+require 'git-pivotal-tracker-integration/command/configuration'
+require 'git-pivotal-tracker-integration/util/git'
 
 describe GitPivotalTrackerIntegration::Command::Base do
 
@@ -24,7 +24,7 @@ describe GitPivotalTrackerIntegration::Command::Base do
     $stdout = StringIO.new
     $stderr = StringIO.new
 
-    @project = double("project")
+    @project = double('project')
     GitPivotalTrackerIntegration::Util::Git.should_receive(:repository_root)
     GitPivotalTrackerIntegration::Command::Configuration.any_instance.should_receive(:api_token)
     GitPivotalTrackerIntegration::Command::Configuration.any_instance.should_receive(:project_id)
@@ -32,7 +32,7 @@ describe GitPivotalTrackerIntegration::Command::Base do
     @base = GitPivotalTrackerIntegration::Command::Base.new
   end
 
-  it "should not run" do
+  it 'should not run' do
     lambda { @base.run }.should raise_error
   end
 end

data/spec/git-pivotal-tracker-integration/command/configuration_spec.rb

@@ -13,10 +13,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "spec_helper"
-require "git-pivotal-tracker-integration/command/configuration"
-require "git-pivotal-tracker-integration/util/git"
-require "pivotal-tracker"
+require 'spec_helper'
+require 'git-pivotal-tracker-integration/command/configuration'
+require 'git-pivotal-tracker-integration/util/git'
+require 'pivotal-tracker'
 
 describe GitPivotalTrackerIntegration::Command::Configuration do
 
@@ -26,60 +26,60 @@ describe GitPivotalTrackerIntegration::Command::Configuration do
     @configuration = GitPivotalTrackerIntegration::Command::Configuration.new
   end
 
-  it "should not prompt the user for the API token if it is already configured" do
-    GitPivotalTrackerIntegration::Util::Git.should_receive(:get_config).with("pivotal.api-token", :inherited).and_return("test_api_token")
+  it 'should not prompt the user for the API token if it is already configured' do
+    GitPivotalTrackerIntegration::Util::Git.should_receive(:get_config).with('pivotal.api-token', :inherited).and_return('test_api_token')
 
     api_token = @configuration.api_token
 
-    expect(api_token).to eq("test_api_token")
+    expect(api_token).to eq('test_api_token')
   end
 
-  it "should prompt the user for the API token if it is not configured" do |variable|
-    GitPivotalTrackerIntegration::Util::Git.should_receive(:get_config).with("pivotal.api-token", :inherited).and_return("")
-    @configuration.should_receive(:ask).and_return("test_api_token")
-    GitPivotalTrackerIntegration::Util::Git.should_receive(:set_config).with("pivotal.api-token", "test_api_token", :global)
+  it 'should prompt the user for the API token if it is not configured' do
+    GitPivotalTrackerIntegration::Util::Git.should_receive(:get_config).with('pivotal.api-token', :inherited).and_return('')
+    @configuration.should_receive(:ask).and_return('test_api_token')
+    GitPivotalTrackerIntegration::Util::Git.should_receive(:set_config).with('pivotal.api-token', 'test_api_token', :global)
 
     api_token = @configuration.api_token
 
-    expect(api_token).to eq("test_api_token")
+    expect(api_token).to eq('test_api_token')
   end
 
-  it "should not prompt the user for the project id if it is already configured" do
-    GitPivotalTrackerIntegration::Util::Git.should_receive(:get_config).with("pivotal.project-id", :inherited).and_return("test_project_id")
+  it 'should not prompt the user for the project id if it is already configured' do
+    GitPivotalTrackerIntegration::Util::Git.should_receive(:get_config).with('pivotal.project-id', :inherited).and_return('test_project_id')
 
     project_id = @configuration.project_id
 
-    expect(project_id).to eq("test_project_id")
+    expect(project_id).to eq('test_project_id')
   end
 
-  it "should prompt the user for the API token if it is not configured" do
-    GitPivotalTrackerIntegration::Util::Git.should_receive(:get_config).with("pivotal.project-id", :inherited).and_return("")
-    menu = double("menu")
+  it 'should prompt the user for the API token if it is not configured' do
+    GitPivotalTrackerIntegration::Util::Git.should_receive(:get_config).with('pivotal.project-id', :inherited).and_return('')
+    menu = double('menu')
     menu.should_receive(:prompt=)
     PivotalTracker::Project.should_receive(:all).and_return([
-      PivotalTracker::Project.new(:id => "id-2", :name => "name-2"),
-      PivotalTracker::Project.new(:id => "id-1", :name => "name-1")])
-    menu.should_receive(:choice).with("name-1")
-    menu.should_receive(:choice).with("name-2")
-    @configuration.should_receive(:choose) { |&arg| arg.call menu }.and_return("test_project_id")
-    GitPivotalTrackerIntegration::Util::Git.should_receive(:set_config).with("pivotal.project-id", "test_project_id", :local)
+      PivotalTracker::Project.new(:id => 'id-2', :name => 'name-2'),
+      PivotalTracker::Project.new(:id => 'id-1', :name => 'name-1')])
+    menu.should_receive(:choice).with('name-1')
+    menu.should_receive(:choice).with('name-2')
+    @configuration.should_receive(:choose) { |&arg| arg.call menu }.and_return('test_project_id')
+    GitPivotalTrackerIntegration::Util::Git.should_receive(:set_config).with('pivotal.project-id', 'test_project_id', :local)
 
     project_id = @configuration.project_id
 
-    expect(project_id).to eq("test_project_id")
+    expect(project_id).to eq('test_project_id')
   end
 
-  it "should persist the story when requested" do
-    GitPivotalTrackerIntegration::Util::Git.should_receive(:set_config).with("pivotal-story-id", 12345678, :branch)
+  it 'should persist the story when requested' do
+    GitPivotalTrackerIntegration::Util::Git.should_receive(:set_config).with('pivotal-story-id', 12345678, :branch)
 
     @configuration.story = PivotalTracker::Story.new(:id => 12345678)
   end
 
-  it "should return a story when requested" do
-    project = double("project")
-    stories = double("stories")
-    story = double("story")
-    GitPivotalTrackerIntegration::Util::Git.should_receive(:get_config).with("pivotal-story-id", :branch).and_return("12345678")
+  it 'should return a story when requested' do
+    project = double('project')
+    stories = double('stories')
+    story = double('story')
+    GitPivotalTrackerIntegration::Util::Git.should_receive(:get_config).with('pivotal-story-id', :branch).and_return('12345678')
     project.should_receive(:stories).and_return(stories)
     stories.should_receive(:find).with(12345678).and_return(story)
 

data/spec/git-pivotal-tracker-integration/command/finish_spec.rb

@@ -13,11 +13,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "spec_helper"
-require "git-pivotal-tracker-integration/command/configuration"
-require "git-pivotal-tracker-integration/command/finish"
-require "git-pivotal-tracker-integration/util/git"
-require "pivotal-tracker"
+require 'spec_helper'
+require 'git-pivotal-tracker-integration/command/configuration'
+require 'git-pivotal-tracker-integration/command/finish'
+require 'git-pivotal-tracker-integration/util/git'
+require 'pivotal-tracker'
 
 describe GitPivotalTrackerIntegration::Command::Finish do
 
@@ -25,7 +25,7 @@ describe GitPivotalTrackerIntegration::Command::Finish do
     $stdout = StringIO.new
     $stderr = StringIO.new
 
-    @project = double("project")
+    @project = double('project')
     GitPivotalTrackerIntegration::Util::Git.should_receive(:repository_root)
     GitPivotalTrackerIntegration::Command::Configuration.any_instance.should_receive(:api_token)
     GitPivotalTrackerIntegration::Command::Configuration.any_instance.should_receive(:project_id)
@@ -33,13 +33,13 @@ describe GitPivotalTrackerIntegration::Command::Finish do
     @finish = GitPivotalTrackerIntegration::Command::Finish.new
   end
 
-  it "should run" do
+  it 'should run' do
     GitPivotalTrackerIntegration::Util::Git.should_receive(:trivial_merge?)
     GitPivotalTrackerIntegration::Command::Configuration.any_instance.should_receive(:story)
     GitPivotalTrackerIntegration::Util::Git.should_receive(:merge)
-    GitPivotalTrackerIntegration::Util::Git.should_receive(:branch_name).and_return("master")
-    GitPivotalTrackerIntegration::Util::Git.should_receive(:push).with("master")
+    GitPivotalTrackerIntegration::Util::Git.should_receive(:branch_name).and_return('master')
+    GitPivotalTrackerIntegration::Util::Git.should_receive(:push).with('master')
 
-    @finish.run
+    @finish.run nil
   end
 end

data/spec/git-pivotal-tracker-integration/command/release_spec.rb

@@ -13,12 +13,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "spec_helper"
-require "git-pivotal-tracker-integration/command/configuration"
-require "git-pivotal-tracker-integration/command/release"
-require "git-pivotal-tracker-integration/util/git"
-require "git-pivotal-tracker-integration/util/story"
-require "pivotal-tracker"
+require 'spec_helper'
+require 'git-pivotal-tracker-integration/command/configuration'
+require 'git-pivotal-tracker-integration/command/release'
+require 'git-pivotal-tracker-integration/util/git'
+require 'git-pivotal-tracker-integration/util/story'
+require 'pivotal-tracker'
 
 describe GitPivotalTrackerIntegration::Command::Release do
 
@@ -26,7 +26,7 @@ describe GitPivotalTrackerIntegration::Command::Release do
     $stdout = StringIO.new
     $stderr = StringIO.new
 
-    @project = double("project")
+    @project = double('project')
     GitPivotalTrackerIntegration::Util::Git.should_receive(:repository_root)
     GitPivotalTrackerIntegration::Command::Configuration.any_instance.should_receive(:api_token)
     GitPivotalTrackerIntegration::Command::Configuration.any_instance.should_receive(:project_id)
@@ -34,22 +34,22 @@ describe GitPivotalTrackerIntegration::Command::Release do
     @release = GitPivotalTrackerIntegration::Command::Release.new
   end
 
-  it "should run" do
+  it 'should run' do
     story = PivotalTracker::Story.new(:id => 12345678)
-    updater = double("updater")
+    updater = double('updater')
     GitPivotalTrackerIntegration::Util::Story.should_receive(:select_story).and_return(story)
     GitPivotalTrackerIntegration::Util::Story.should_receive(:pretty_print)
     GitPivotalTrackerIntegration::VersionUpdate::Gradle.should_receive(:new).and_return(updater)
     updater.should_receive(:supports?).and_return(true)
-    updater.should_receive(:current_version).and_return("test_current_version")
-    @release.should_receive(:ask).and_return("test_release_version")
-    @release.should_receive(:ask).and_return("test_next_version")
-    updater.should_receive(:update_version).with("test_release_version")
-    GitPivotalTrackerIntegration::Util::Git.should_receive(:create_release_tag).with("test_release_version", story)
-    updater.should_receive(:update_version).with("test_next_version")
-    GitPivotalTrackerIntegration::Util::Git.should_receive(:create_commit).with("test_next_version Development", story)
-    GitPivotalTrackerIntegration::Util::Git.should_receive(:branch_name).and_return("master")
-    GitPivotalTrackerIntegration::Util::Git.should_receive(:push).with("master", "vtest_release_version")
+    updater.should_receive(:current_version).and_return('test_current_version')
+    @release.should_receive(:ask).and_return('test_release_version')
+    @release.should_receive(:ask).and_return('test_next_version')
+    updater.should_receive(:update_version).with('test_release_version')
+    GitPivotalTrackerIntegration::Util::Git.should_receive(:create_release_tag).with('test_release_version', story)
+    updater.should_receive(:update_version).with('test_next_version')
+    GitPivotalTrackerIntegration::Util::Git.should_receive(:create_commit).with('test_next_version Development', story)
+    GitPivotalTrackerIntegration::Util::Git.should_receive(:branch_name).and_return('master')
+    GitPivotalTrackerIntegration::Util::Git.should_receive(:push).with('master', 'vtest_release_version')
 
     @release.run(nil)
   end

data/spec/git-pivotal-tracker-integration/command/start_spec.rb

@@ -13,12 +13,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "spec_helper"
-require "git-pivotal-tracker-integration/command/configuration"
-require "git-pivotal-tracker-integration/command/start"
-require "git-pivotal-tracker-integration/util/git"
-require "git-pivotal-tracker-integration/util/story"
-require "pivotal-tracker"
+require 'spec_helper'
+require 'git-pivotal-tracker-integration/command/configuration'
+require 'git-pivotal-tracker-integration/command/start'
+require 'git-pivotal-tracker-integration/util/git'
+require 'git-pivotal-tracker-integration/util/story'
+require 'pivotal-tracker'
 
 describe GitPivotalTrackerIntegration::Command::Start do
 
@@ -26,8 +26,8 @@ describe GitPivotalTrackerIntegration::Command::Start do
     $stdout = StringIO.new
     $stderr = StringIO.new
 
-    @project = double("project")
-    @story = double("story")
+    @project = double('project')
+    @story = double('story')
     GitPivotalTrackerIntegration::Util::Git.should_receive(:repository_root)
     GitPivotalTrackerIntegration::Command::Configuration.any_instance.should_receive(:api_token)
     GitPivotalTrackerIntegration::Command::Configuration.any_instance.should_receive(:project_id)
@@ -35,20 +35,20 @@ describe GitPivotalTrackerIntegration::Command::Start do
     @start = GitPivotalTrackerIntegration::Command::Start.new
   end
 
-  it "should run" do
-    GitPivotalTrackerIntegration::Util::Story.should_receive(:select_story).with(@project, "test_filter").and_return(@story)
+  it 'should run' do
+    GitPivotalTrackerIntegration::Util::Story.should_receive(:select_story).with(@project, 'test_filter').and_return(@story)
     GitPivotalTrackerIntegration::Util::Story.should_receive(:pretty_print)
     @story.should_receive(:id).twice.and_return(12345678)
-    @start.should_receive(:ask).and_return("development_branch")
-    GitPivotalTrackerIntegration::Util::Git.should_receive(:create_branch).with("12345678-development_branch")
+    @start.should_receive(:ask).and_return('development_branch')
+    GitPivotalTrackerIntegration::Util::Git.should_receive(:create_branch).with('12345678-development_branch')
     GitPivotalTrackerIntegration::Command::Configuration.any_instance.should_receive(:story=)
     GitPivotalTrackerIntegration::Util::Git.should_receive(:add_hook)
-    GitPivotalTrackerIntegration::Util::Git.should_receive(:get_config).with("user.name").and_return("test_owner")
+    GitPivotalTrackerIntegration::Util::Git.should_receive(:get_config).with('user.name').and_return('test_owner')
     @story.should_receive(:update).with(
-      :current_state => "started",
-      :owned_by => "test_owner"
+      :current_state => 'started',
+      :owned_by => 'test_owner'
     )
 
-    @start.run "test_filter"
+    @start.run 'test_filter'
   end
 end