story_branch 0.6.0alpha → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9a02518d7bc7ed6989a8bac354b4586d52268211024e1253f33ca0345c4f08d
-  data.tar.gz: 38a6bdff3edc0038164d693964738d7a9eff743ddb9fade2c1a3a9c01cd70fd1
+  metadata.gz: 1826485750874314fb2570c93b1330a89f88e36571a84fe63482a33ffbb50d34
+  data.tar.gz: 2914e9113a13b0ab0546485faa0b8acea1906f84b459f54c2d835433891bbb0c
 SHA512:
-  metadata.gz: fdfc646432ce7e0b952659de39efdadc0fc2e09ede2e3e9651d00a3e5840719a14279ae92cec49552572638fa4fdc23eaffe365f65bceec8df97ee494189e84f
-  data.tar.gz: 2eebfaf7313adbb7d48c8f4d91f054db99d3fc1af63b20bb6996a7e260b104d68d23913224d4429e12b3d9d468e5430b99fcb63988700ddb6a0e49c0d00775ef
+  metadata.gz: baf40433309c1939869490828cdb7cbd2749ba9cb22f09579e0003f989fecf84ced996bc0ae64a6babc58debc43c601093659a231c1c3ef5a12e31055f9badde
+  data.tar.gz: b24f7b09b8eadee1960cd4a053f6007c23bb46535af08667e5fab08b6bbb15e622664110e05ba2783eacb6e07fe4033d901bd9b0e8d5ab5abd4c71e38fc359d2

data/.github/workflows/rubocop.yml

@@ -0,0 +1,19 @@
+name: Rubocop
+
+on: [push]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: Set up Ruby 2.6
+      uses: actions/setup-ruby@v1
+      with:
+        ruby-version: 2.6.x
+    - name: Rubocop Linter
+      uses: andrewmcodes/rubocop-linter-action@v0.1.2
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

data/.rubocop.yml

@@ -0,0 +1,9 @@
+Metrics/BlockLength:
+  Exclude:
+    - 'spec/**/*.rb'
+AllCops:
+  Exclude:
+    - '**/*.gemspec'
+    - 'exe/*'
+    - '**/Gemfile'
+    - '.github/**/*'

data/.ruby-version

@@ -1 +1 @@
-2.5.1
+2.6.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    story_branch (0.6.0alpha)
+    story_branch (0.6.0)
       blanket_wrapper (~> 3.0)
       damerau-levenshtein (~> 1.3)
       jira-ruby (~> 1.7)

data/README.md

@@ -1,5 +1,6 @@
 [![Gem Version](https://badge.fury.io/rb/story_branch.png)](http://badge.fury.io/rb/story_branch)
 [![CircleCI](https://circleci.com/gh/story-branch/story_branch/tree/master.svg?style=svg)](https://circleci.com/gh/story-branch/story_branch/tree/master)
+[![Maintainability](https://api.codeclimate.com/v1/badges/7dbd75908417656853d7/maintainability)](https://codeclimate.com/github/story-branch/story_branch/maintainability)
 
 # Story Branch
 

data/exe/git-finish

@@ -1,4 +1,3 @@
-#!/usr/bin/env ruby
-# rubocop:disable Style/FrozenStringLiteralComment
+# !/usr/bin/env ruby
 
 `story_branch finish`

data/lib/story_branch/commands/migrate.rb

@@ -35,12 +35,14 @@ module StoryBranch
 
       def project_id
         return @project_id if @project_id
+
         @project_id = old_config_value('project', 'PIVOTAL_PROJECT_ID')
         @project_id
       end
 
       def api_key
         return @api_key if @api_key
+
         @api_key = old_config_value('api', 'PIVOTAL_API_KEY')
         @api_key
       end
@@ -52,6 +54,7 @@ module StoryBranch
       def missing_old_config?
         OLD_CONFIG_FILES.each { |file| return false if File.exist?(file) }
         return false if env_set?
+
         true
       end
 

data/lib/story_branch/github/project.rb

@@ -12,10 +12,11 @@ module StoryBranch
 
       def stories(options = {})
         stories = if options[:id]
-                    [@repo.issues(options[:id]).get.payload]
+                    [@repo.issues(options[:id]).get]
                   else
-                    @repo.issues.get(params: options).payload
+                    @repo.issues.get(params: options)
                   end
+
         stories.reject!(&:pull_request)
         stories.map { |s| Issue.new(s, @repo) }
       end

data/lib/story_branch/main.rb

@@ -9,8 +9,9 @@ require_relative './config_manager'
 require 'tty-prompt'
 
 module StoryBranch
-  # Main story branch class. It is resposnible for the main interaction between
+  # Main story branch class. It is responsible for the main interaction between
   # the user and Pivotal Tracker. It is also responsible for config init.
+
   # rubocop:disable Metrics/ClassLength
   class Main
     attr_accessor :tracker
@@ -41,13 +42,11 @@ module StoryBranch
     end
 
     def story_finish
-      current_story = tracked_story
+      current_story
       return if unstaged_changes?
       return if nothing_to_add?
 
-      # rubocop:disable Metrics/LineLength
-      commit_message = "[#{finish_tag} ##{current_story[:id]}] #{current_story[:title]}"
-      # rubocop:enable Metrics/LineLength
+      commit_message = build_finish_message
       proceed = prompt.yes?("Commit with standard message? #{commit_message}")
       if proceed
         GitWrapper.commit commit_message
@@ -83,10 +82,14 @@ module StoryBranch
       true
     end
 
-    def tracked_story
+    def current_story
+      return @current_story if @current_story
+
       current_story = GitUtils.current_branch_story_parts
-      if !current_story.empty? && @tracker.get_story_by_id(current_story[:id])
-        return current_story
+
+      unless current_story.empty?
+        @current_story = @tracker.get_story_by_id(current_story[:id])
+        return @current_story if @current_story
       end
 
       prompt.error('No tracked feature associated with this branch')
@@ -152,9 +155,7 @@ module StoryBranch
     end
 
     def prompt
-      return @prompt if @prompt
-
-      @prompt = TTY::Prompt.new(interrupt: :exit)
+      @prompt ||= TTY::Prompt.new(interrupt: :exit)
     end
 
     def finish_tag
@@ -167,6 +168,11 @@ module StoryBranch
       @finish_tag
     end
 
+    def build_finish_message
+      message_tag = [finish_tag, "##{current_story.id}"].join(' ').strip
+      "[#{message_tag}] #{current_story.title}"
+    end
+
     def create_feature_branch(story)
       return if story.nil?
 

data/lib/story_branch/pivotal/project.rb

@@ -14,9 +14,9 @@ module StoryBranch
       # TODO: add other possible args
       def stories(options = {}, estimated = true)
         stories = if options[:id]
-                    [@project.stories(options[:id]).get.payload]
+                    [@project.stories(options[:id]).get]
                   else
-                    @project.stories.get(params: options).payload
+                    @project.stories.get(params: options)
                   end
         stories = stories.map { |s| Story.new(s, @project) }
         return stories if estimated == false

data/lib/story_branch/pivotal/story.rb

@@ -20,7 +20,7 @@ module StoryBranch
 
       def update_state(new_state)
         params = { current_state: new_state }
-        @project.stories(@id).put(body: params).payload
+        @project.stories(@id).put(body: params)
       end
 
       def to_s

data/lib/story_branch/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module StoryBranch
-  VERSION = '0.6.0alpha'
+  VERSION = '0.6.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: story_branch
 version: !ruby/object:Gem::Version
-  version: 0.6.0alpha
+  version: 0.6.0
 platform: ruby
 authors:
 - Rui Baltazar
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-06 00:00:00.000000000 Z
+date: 2019-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blanket_wrapper
@@ -261,8 +261,10 @@ files:
 - ".circleci/setup-rubygems.sh"
 - ".github/ISSUE_TEMPLATE.md"
 - ".github/PULL_REQUEST_TEMPLATE.md"
+- ".github/workflows/rubocop.yml"
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".ruby-version"
 - ".story_branch.yml"
 - Changelog.md
@@ -336,9 +338,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.3
 signing_key: