github-trello-cl 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3595893cd5170484e996fbddac79fed64e4eb715
-  data.tar.gz: b1a21bd789038a477207838a4048ff7210245eba
+  metadata.gz: dbe4ebd4580cffcf4a1a8d5b00b531faf1d6d08b
+  data.tar.gz: 6121208f023c821cff6a5171c047075152c452a6
 SHA512:
-  metadata.gz: 7b25b28c3a4b9c798a73d39aaf00563f73142689c2c1117fc51c90314d243606217282fd5bfe7c81c2ae0fac5f0d20eb5123e9442a83c05817c671e033a86b49
-  data.tar.gz: d1319df588934aa9c5bd7471c0d39689a3655f65d9717bbc57b03cb78256d552c2fd3038cf40bcc98aba78b6f7e031367f86c0a53422246c04cedcf68ffd568d
+  metadata.gz: 4e563f93740a128086268cfcf5b88b8c9ace7736c17c7ddc06a0126e67539bfc3d9f3f8307ccbd7e48b0b5bfd45fcb2e161c63a9644ee34d9da57c6dc9371398
+  data.tar.gz: d8899452ef7a721c5f445ea72d85348c1e76dd968e49326b14f7203f2904d8a71d8c90eef00012bec4318d9412aae9094539e6482aed5eed9a1b810a9ee083d6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    github-trello-cl (0.1.3)
+    github-trello-cl (0.1.5)
       commander (~> 4.3.0)
       httparty (~> 0.13.3)
       launchy (~> 2.4.3)

data/lib/trello.rb

@@ -153,7 +153,8 @@ module Trello
       command :start do |c|
         c.syntax = 'trello start 123 <branch>'
         c.description = "Marks the specified card as 'in development' on Trello and associates the specified branch with the card."
-        c.option '--hotfix', 'Starts the card as a hotfix branch instead of a feature branch.'
+        c.option '--hotfix', 'Starts the card as a hotfix through git-flow.'
+        c.option '--feature', 'Starts the card as a feature through git-flow.'
         c.option '--no-branch', 'Starts the card without creating a new branch.'
         c.action do |args, options|
           card_number, branch = args
@@ -167,15 +168,19 @@ module Trello
               abort 'You need a branch name. To start this card without a branch, set the --no-branch flag (-n).'
             end
 
-            branch_prefix = options.hotfix ? 'hotfix' : 'feature'
-            prefixed_branch = "#{branch_prefix}/#{branch}"
+            if [options.hotfix, options.feature].any?
+              branch = branch.sub(/(feature|hotfix)\//, '') # remove any feature/hotfix prefixes they mistakenly added
+              branch_prefix = options.hotfix ? 'hotfix' : 'feature'
 
-            unless system "git flow #{branch_prefix} start #{branch}"
-              abort "Failed to create branch locally - exiting."
+              unless system "git flow #{branch_prefix} start #{branch}"
+                abort "Failed to create branch locally - exiting."
+              end
+
+              branch = "#{branch_prefix}/#{branch}"
             end
           end
 
-          response = Api::Integration.make_call(:post, "cards/#{card_number}/start", {user: user, branch: (options['no-branch'] ? nil : prefixed_branch)})
+          response = Api::Integration.make_call(:post, "cards/#{card_number}/start", {user: user, branch: (options['no-branch'] ? nil : branch)})
           if response.success?
             say "Started card #{card_number} with branch #{prefixed_branch}."
           end

data/trello.gemspec

@@ -2,7 +2,7 @@ $LOAD_PATH << File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = 'github-trello-cl'
-  s.version     = '0.1.4'
+  s.version     = '0.1.5'
   s.date        = '2015-02-23'
   s.summary     = "Interface with trello"
   s.description = "A tool to allow people using Trello as a workflow to interface with it via command line access to an API"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: github-trello-cl
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Steve Pletcher
@@ -138,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Interface with trello