story_branch 0.3.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88d329246f46653a325a892dd5ea2c0a9b2d486c
-  data.tar.gz: 93122538de6bfb7dd0943366602e6bb23554a5d7
+  metadata.gz: 46d477c2727de7887ac34b2d2e4a5bb1082db251
+  data.tar.gz: 4e0e0c00d4eb031bd680c39476e880e71fc98adb
 SHA512:
-  metadata.gz: 9d02a9623ed39bc5121fc03d2511164410b08882c7e68afb30c0adeea35ea61deee608b41b35306ff34bec014e4ee92580af788b4c170f9a87a9bb692685250c
-  data.tar.gz: 1e49a278f7763282a58eb66782f28cf2437ec2771599ed25c94d0cb153d55918afe6e2411b123064e91f673bac46cbb23596956e8ecf5333f5cfaf703fe09734
+  metadata.gz: b39a085f360679091be09fdacf51d5905ec1f85293ea1f4987c9b3fd4dd2f87a663308182bcd23c9b465fff2c408d7514fc349469b55bebcf9d469518b366123
+  data.tar.gz: c8adc6a6c9c6630ff2868573654898cf0b1e4541bdc108701a4a467bf3df004c9e22eeeeb11ce3b5aa6d7f6dffb863a7d16623da071360e939bc13827b76061e

data/.circleci/config.yml

@@ -5,6 +5,22 @@ defaults: &defaults
     - image: circleci/ruby:2.4.1-node-browsers
   working_directory: ~/repo
 
+workflows:
+  version: 2
+  test-and-publish:
+    jobs:
+      - test:
+          filters:
+            branches:
+              only: /.*/
+
+      - publish:
+          requires:
+            - test
+          filters:
+            branches:
+              only: master
+
 jobs:
   test:
     <<: *defaults
@@ -72,36 +88,14 @@ jobs:
       - run:
           name: Publish to Rubygems
           command: |
-            echo "-------- 8< --------"
-            ls ~/.gem/
-
-            cat ~/.gem/credentials
-            echo "-------- >8 --------"
-
             CURRENT_VERSION=$(ruby -r "./lib/story_branch/version.rb" -e "puts StoryBranch::VERSION")
             CURRENT_TAG=$(git tag --points-at HEAD)
 
-            if [[ "$CURRENT_TAG" == "$CURRENT_VERSION" ]]; then
+            if [[ "${CURRENT_TAG}" == "${CURRENT_VERSION}" ]]; then
               gem build story_branch.gemspec
-              gem push --backtrace --debug --verbose "story_branch-${CURRENT_VERSION}.gem"
+              gem push "story_branch-${CURRENT_VERSION}.gem"
             else
-              echo "Not a version tagged commit..."
+              echo "Not tagged as a new version - skipping gem push"
             fi
 
             shred -u ~/.gem/credentials
-
-workflows:
-  version: 2
-  test-and-publish:
-    jobs:
-      - test:
-          filters:
-            branches:
-              only: /.*/
-
-      - publish:
-          requires:
-            - test
-          filters:
-            branches:
-              only: master

data/.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,14 @@
+# Issue Title
+
+- Resolving issues caused by that problem
+
+# Main changes
+
+- Did this to try to improve that
+- Did something else for something else
+
+# Remove from here below if there is nothing to be added to the changelog
+CHANGELOG
+ - change 1
+ - change 2
+--- 8< ---

data/.ruby-version

@@ -1 +1 @@
-2.3.1
+2.5.1

data/Changelog.md

@@ -0,0 +1,145 @@
+# 0.3.3
+Tue Jun 26 15:18:37 2018 +0800
+
+- Deploy to Rubygems via CI/CD - CircleCI
+
+# 0.3.1
+Tue Jun 26 15:18:37 2018 +0800
+
+- Fixed Story branch finish is broken
+- Update to use Ruby 2.3.0 minimum
+- Support multiple configurations
+- Allow configuration of finish keyword
+- Making use of TTY Prompt to collect input from the user
+- Cleaned up some code on PivotalUtils to simplify logic
+- Improved test coverage
+- Added minimum version to gemspec
+- Added .ruby-version file with ruby 2.3.1.
+- Cleanup a lot of the rubocop warnings
+- Running the commands using TTY::Command
+- Added Migrate command to upgrade current public version to new version
+- Updated dependencies
+- Updated readme for a more comprehensive usage
+
+# 0.2.13
+Tue Nov 14 15:12:58 2017 +0800
+
+- Fix abort on empty config file
+
+# 0.2.12
+Wed Jun 8 11:07:06 2016 +0800
+
+- Remove byebug since it is not in dependency
+- Load config from different files (home dir or project local)
+
+# 0.2.9
+Fri May 15 14:03:00 2015 +0800
+
+- Fix strip newlines
+
+# 0.2.8
+Tue May 12 17:47:22 2015 +0800
+
+- Removed pivotal-tracker gem dependency,
+- Using Blanket Wrapper to access Pivotal API
+
+# 0.2.7
+Tue Apr 14 18:57:34 2015 +0800
+
+- Remove deprecated CLI bins
+
+# 0.2.5
+Wed Sep 17 11:20:20 2014 +0800
+
+- Fix error story_branch/issues/15 on git finish
+- Fix error story_branch/issues/16 newlines in story names
+- Fix existing branch / story validation
+- Improve / simplify error messages
+- Improve name sanitisation
+- Added story unstart
+
+# 0.2.4
+Fri Aug 22 14:27:47 2014 +0800
+
+- Fixes problem with story finish
+
+# 0.2.3
+Thu Aug 21 10:53:21 2014 +0800
+
+- Fix rb-readline dependency
+
+# 0.2.3
+Tue Aug 19 10:35:43 2014 +0800
+
+- Fix specs and rspec reporter
+- Use rb-readline
+- Fix Readline completion, using rb-readline
+- Add pry for debugging support
+- Output errors to stderr
+- Modify completion system, general improvements
+- Humanize / undash the commit message description (from the branch name)
+
+# 0.2.2
+Tue Aug 12 17:43:30 2014 +0800
+
+- Add start and finish stories.
+- Fix path in symlinks
+
+# 0.1.8
+Tue Jun 24 11:09:32 2014 +0800
+
+- Remove constraint to master as feature parent.
+- Add aliases for story_branch executable
+
+# 0.1.5
+Mon May 26 10:34:12 2014 +0800
+
+- tidy up output and add LICENCE
+
+# 0.1.4
+Thu May 15 09:58:03 2014 +0800
+
+- Update name generation / translation rules
+- Squeeze multiple dashes in suggested branch name
+- Remove logging
+- Ignore .pairs
+
+# 0.1.1
+Mon Apr 21 11:44:22 2014 +0800
+
+- Updated code to require gem instead of relative paths
+- Finishes #4 test definition
+- Clear test files for tests specifications
+- Searches for existing file or environment set variable. Existing file overrides the env var
+- Raise PIVOTAL_API_KEY exception if api key not found in env. added method to check if object is set with api_key and project_id
+
+# 0.0.1
+Sat Apr 19 00:24:41 2014 +0800
+
+- Add usage info (draft) to file header
+- Add simple_sanitize method to remove common punctuation from story
+  names / existing branch names
+- Remove arbitrary 50 char limit on branch names
+- Convert to a command utility gem + refactoring into a class
+- Removed levenshtein dependency. added ruby min version
+
+
+# 0.0.0
+Sat Jan 25 19:04:01 2014 +0800
+
+- Look for pivotal project id (.pivotal-id) in repo root (we assume
+  we're in project root.) (we do this and fallback to checking
+  environment var)
+- Added Levenshtein Distance checking to branch names, to avoid names
+  which are too close together (and straight-up duplicates)
+- Added read-line support and re-factored
+- Read-line support (to use instead of gets)
+- Allow injection of history into read-line invocations
+- Injected selection numbers into story selection read-line history
+- Dashed / down-cased story name as a suggestion for the new feature
+  branch name
+- Injected dash/down-cased story name into new feature branch name
+  read-line history (move up to get it)
+- Fix error testing PIVOTAL_PROJECT_ID
+- Rename ptrak to story_branch
+- Basic version passing

data/Gemfile.lock

@@ -1,17 +1,16 @@
 PATH
   remote: .
   specs:
-    story_branch (0.3.3)
+    story_branch (0.4.0)
       blanket_wrapper (~> 3.0)
       git (~> 1.2)
       levenshtein-ffi (~> 1.0)
       pastel (~> 0.7.2)
-      rb-readline (~> 0.5)
       thor (~> 0.20.0)
-      tty-command (~> 0.8.0)
+      tty-command (~> 0.8.2)
       tty-config (~> 0.2.0)
       tty-pager (~> 0.11.0)
-      tty-prompt (~> 0.16.1)
+      tty-prompt (~> 0.17.1)
 
 GEM
   remote: https://rubygems.org/
@@ -21,10 +20,9 @@ GEM
       recursive-open-struct
     diff-lcs (1.3)
     equatable (0.5.0)
-    fakefs (0.14.2)
+    fakefs (0.18.0)
     ffi (1.9.25)
-    git (1.4.0)
-    hitimes (1.3.0)
+    git (1.5.0)
     httparty (0.16.2)
       multi_xml (>= 0.5.2)
     levenshtein-ffi (1.1.0)
@@ -34,51 +32,52 @@ GEM
     pastel (0.7.2)
       equatable (~> 0.5.0)
       tty-color (~> 0.4.0)
-    rake (10.4.2)
-    rb-readline (0.5.5)
+    rake (10.5.0)
     recursive-open-struct (1.1.0)
-    rspec (3.0.0)
-      rspec-core (~> 3.0.0)
-      rspec-expectations (~> 3.0.0)
-      rspec-mocks (~> 3.0.0)
-    rspec-core (3.0.4)
-      rspec-support (~> 3.0.0)
-    rspec-expectations (3.0.4)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.0.0)
-    rspec-mocks (3.0.4)
-      rspec-support (~> 3.0.0)
-    rspec-support (3.0.4)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.0)
     rspec_junit_formatter (0.4.1)
       rspec-core (>= 2, < 4, != 2.12.0)
-    strings (0.1.1)
-      unicode-display_width (~> 1.3.0)
+    strings (0.1.4)
+      strings-ansi (~> 0.1.0)
+      unicode-display_width (~> 1.4.0)
       unicode_utils (~> 1.4.0)
+    strings-ansi (0.1.0)
     thor (0.20.0)
-    timers (4.1.2)
-      hitimes
-    tty-color (0.4.2)
-    tty-command (0.8.1)
+    timers (4.2.0)
+    tty-color (0.4.3)
+    tty-command (0.8.2)
       pastel (~> 0.7.0)
     tty-config (0.2.0)
-    tty-cursor (0.5.0)
+    tty-cursor (0.6.0)
     tty-pager (0.11.0)
       strings (~> 0.1.0)
       tty-screen (~> 0.6.4)
       tty-which (~> 0.3.0)
-    tty-prompt (0.16.1)
+    tty-prompt (0.17.2)
       necromancer (~> 0.4.0)
       pastel (~> 0.7.0)
       timers (~> 4.0)
-      tty-cursor (~> 0.5.0)
-      tty-reader (~> 0.3.0)
-    tty-reader (0.3.0)
-      tty-cursor (~> 0.5.0)
+      tty-cursor (~> 0.6.0)
+      tty-reader (~> 0.4.0)
+    tty-reader (0.4.0)
+      tty-cursor (~> 0.6.0)
       tty-screen (~> 0.6.4)
       wisper (~> 2.0.0)
-    tty-screen (0.6.4)
+    tty-screen (0.6.5)
     tty-which (0.3.0)
-    unicode-display_width (1.3.3)
+    unicode-display_width (1.4.0)
     unicode_utils (1.4.0)
     wisper (2.0.0)
 
@@ -89,9 +88,9 @@ DEPENDENCIES
   bundler (~> 1.16)
   fakefs (~> 0.14)
   rake (~> 10.0)
-  rspec (~> 3.0)
-  rspec_junit_formatter
+  rspec (~> 3)
+  rspec_junit_formatter (~> 0.4)
   story_branch!
 
 BUNDLED WITH
-   1.16.2
+   1.17.1

data/README.md

@@ -8,6 +8,8 @@ at the moment. It allows you to start and un-start stories as well as creating
 branches based on the story name and id and have a final commit message marking
 the story as Finished.
 
+[View Changelog](Changelog.md)
+
 ## Installing
 
 Install the gem:

data/Roadmap.md

@@ -0,0 +1,23 @@
+# Architecture view
+
+::Main
+  - Read config
+  - Initialize utils to use
+  - Provide interface for opening/closing/config the gem
+
+::ConfigManager
+  - load configuration files and have methods to fetch project id, api key and
+  finish tag according to the needs
+
+::PivotalUtils
+  - Wrap PivotalTracker API
+  - Get Story List
+  - ...
+
+::GithubUtils
+  - Wrap Github API
+  - Get Issue List
+  - Integrate with Project workflow (?)
+
+::OtherTrackers
+  - Provide interface for extending to other trackers

data/lib/story_branch/commands/add.rb

@@ -15,7 +15,7 @@ module StoryBranch
     class Add < StoryBranch::Command
       def initialize(options)
         @options = options
-        @config = ConfigManager.init_config(ENV['HOME'])
+        @config = ConfigManager.init_config(Dir.home)
         @local_config = ConfigManager.init_config('.')
       end
 
@@ -28,7 +28,7 @@ module StoryBranch
       private
 
       def create_local_config
-        @local_config.set(:project_id, value: project_id)
+        @local_config.append(project_id, to: :project_id)
         @local_config.write(force: true)
       end
 
@@ -40,6 +40,7 @@ module StoryBranch
 
       def project_id
         return @project_id if @project_id
+
         @project_id = prompt.ask "Please provide this project's id:"
         @project_id
       end

data/lib/story_branch/git_utils.rb

@@ -22,7 +22,7 @@ module StoryBranch
       false
     end
 
-    def self.existing_story?(id)
+    def self.branch_for_story_exists?(id)
       branch_names.each do |n|
         branch_id = n.match(/-[1-9][0-9]+$/)
         next unless branch_id
@@ -45,7 +45,7 @@ module StoryBranch
 
     def self.current_branch_story_parts
       matches = current_story
-      return unless matches.length == 3
+      return {} unless matches.length == 3
       { title: matches[1], id: matches[2].to_i }
     end