story_branch 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d7d4d41d52f404121543545261d35ee4549bf4c
-  data.tar.gz: 501c4cbf920c86d5d3e161e232670b2e3f813570
+  metadata.gz: be4f0873eb09acca67a272cfbedfc75c3317265b
+  data.tar.gz: 6d44e1bf700cc8e96805ea15330f15326b03aca1
 SHA512:
-  metadata.gz: d41edd251bb11ec5adb61e0e852574f6d3bd27a7d475a00c91d025e8a6bed44f1c2d7356c169b0eb0c4eab864de1f270d3c410a357564f378b948b186e9526d7
-  data.tar.gz: 3d3016b1ae2ea18df7b6c7c5cf1730d7bb011567fd55eec5866698e4dfff8456d45a508fd3095a6d46ea864c194dbcaa21da359d06279332b1298a0f02b455d0
+  metadata.gz: cc5ec660f36f5756de57ab6e8e1e3755fd1a2e0ad8cb1c14958988052f6f93e72d3e7cc0c5d89c272a2d27f6c716b34ceb4068266089c4170ed7a45c0a49835a
+  data.tar.gz: 81150e943304a054796cc6a0ee927b82d811c39f7687c5eabfc0682c9fa330dff04c8c9698eb75de8551d344750ff19bcc572b83d3dc33828d5e76f60a2a7994

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    story_branch (0.4.1)
+    story_branch (0.4.2)
       blanket_wrapper (~> 3.0)
       levenshtein-ffi (~> 1.0)
       pastel (~> 0.7.2)
@@ -20,7 +20,7 @@ GEM
     diff-lcs (1.3)
     equatable (0.5.0)
     fakefs (0.18.0)
-    ffi (1.9.25)
+    ffi (1.10.0)
     git (1.5.0)
     httparty (0.16.3)
       mime-types (~> 3.0)

data/README.md

@@ -43,9 +43,30 @@ Commands:
 Story branch has a command available that will help you creating the configurations
 for the projects, but essentially you'll be asked for the pivotal tracker project id and your api key.
 
+### Configuring the project id
+
 The project id you can get it easily from the url when viewing the project.
+This value will be stored in the local configuration file that will be committed
+to the working repository
+
+### Configuring the api key
 
 The api key you can get it from your account settings.
+This value will be stored in your global configuration file that typically is
+not shared with your co-workers in the repository. This way, each user will
+be properly identified in the tracker
+
+### Configuring the finish tag
+
+On your local config you can add a line with `finish_tag: <Some random word>`.
+This tag will be used in the commit message when running `story_branch finish`.
+
+E.g.
+`finish_tag: Resolves`
+
+`story_branch finish` will make a commit with the message
+`[Resolves #12313] story title`
+
 
 ### .story_branch files
 

data/lib/story_branch/commands/add.rb

@@ -28,6 +28,9 @@ module StoryBranch
       private
 
       def create_local_config
+        return if local_config_has_value?
+
+        puts "Appending #{project_id}"
         @local_config.append(project_id, to: :project_id)
         @local_config.write(force: true)
       end
@@ -44,6 +47,15 @@ module StoryBranch
         @project_id = prompt.ask "Please provide this project's id:"
         @project_id
       end
+
+      def local_config_has_value?
+        config_value = @local_config.fetch(:project_id)
+        if config_value.is_a? Array
+          config_value.include?(project_id)
+        else
+          config_value == project_id
+        end
+      end
     end
   end
 end

data/lib/story_branch/git_utils.rb

@@ -37,7 +37,7 @@ module StoryBranch
       matches = current_story
       return {} unless matches.length == 3
 
-      title = matches[1].tr('-', ' ')
+      title = matches[1].tr('-', ' ').strip
       { title: title, id: matches[2].to_i }
     end
 

data/lib/story_branch/main.rb

@@ -160,15 +160,14 @@ module StoryBranch
       return @project_id if @project_id
 
       project_ids = @local_config.fetch(:project_id)
+      @project_id = choose_project_id(project_ids)
+    end
+
+    def choose_project_id(project_ids)
+      return project_ids unless project_ids.is_a? Array
+      return project_ids[0] unless project_ids.length > 1
 
-      @project_id = if project_ids.is_a? Array
-                      prompt.select(
-                        'Which project you want to fetch from?',
-                        project_ids
-                      )
-                    else
-                      project_ids
-                    end
+      prompt.select('Which project you want to fetch from?', project_ids)
     end
 
     def api_key

data/lib/story_branch/pivotal_utils.rb

@@ -49,7 +49,7 @@ module StoryBranch
     # TODO: add other possible args
     def stories(options = {}, estimated = true)
       stories = if options[:id]
-                  [@project.stories(options[:id])]
+                  [@project.stories(options[:id]).get.payload]
                 else
                   params = { with_state: options[:with_state] }
                   @project.stories.get(params: params).payload

data/lib/story_branch/string_utils.rb

@@ -3,8 +3,8 @@
 module StoryBranch
   # Utility class for string manipulation
   class StringUtils
-    def self.sanitize(s)
-      res = s.strip
+    def self.sanitize(text)
+      res = text.strip
       res.tr!("\n", '-')
       encoding_options = {
         invalid: :replace, # Replace invalid byte sequences
@@ -14,16 +14,16 @@ module StoryBranch
       res.encode(Encoding.find('ASCII'), encoding_options)
     end
 
-    def self.dashed(s)
-      sanitize(s).tr(" _,./:;+&'\"?", '-').squeeze('-')
+    def self.dashed(text)
+      sanitize(text).tr(" _,./:;+&'\"?<>", '-').squeeze('-').gsub(/-$|^-/, '')
     end
 
-    def self.normalised_branch_name(s)
-      dashed(s).downcase
+    def self.normalised_branch_name(text)
+      dashed(text).downcase
     end
 
-    def self.undashed(s)
-      s.tr('-', ' ').squeeze(' ').strip.capitalize
+    def self.undashed(text)
+      text.tr('-', ' ').squeeze(' ').strip.capitalize
     end
   end
 end

data/lib/story_branch/version.rb

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

data/story_branch.gemspec

@@ -31,7 +31,13 @@ Gem::Specification.new do |spec|
     on the selected story
   DESCRIPTION
 
-  spec.homepage = 'https://github.com/story-branch/story_branch'
+  spec.metadata = {
+    'bug_tracker_uri' => 'https://github.com/story-branch/story_branch/issues',
+    'changelog_uri' => 'https://github.com/story-branch/story_branch/blob/master/Changelog.md',
+    'documentation_uri' => 'https://github.com/story-branch/story_branch/blob/master/README.md',
+    'homepage_uri' => 'https://github.com/story-branch/story_branch',
+    'source_code_uri' => 'https://github.com/story-branch/story_branch'
+  }
   spec.required_ruby_version = ['>= 2.3', '< 2.6']
 
   # Specify which files should be added to the gem when it is released.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: story_branch
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Rui Baltazar
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-23 00:00:00.000000000 Z
+date: 2019-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blanket_wrapper
@@ -274,10 +274,15 @@ files:
 - lib/story_branch/templates/unstart/.gitkeep
 - lib/story_branch/version.rb
 - story_branch.gemspec
-homepage: https://github.com/story-branch/story_branch
+homepage: 
 licenses:
 - MIT
-metadata: {}
+metadata:
+  bug_tracker_uri: https://github.com/story-branch/story_branch/issues
+  changelog_uri: https://github.com/story-branch/story_branch/blob/master/Changelog.md
+  documentation_uri: https://github.com/story-branch/story_branch/blob/master/README.md
+  homepage_uri: https://github.com/story-branch/story_branch
+  source_code_uri: https://github.com/story-branch/story_branch
 post_install_message: 
 rdoc_options: []
 require_paths: