cp8_cli 4.2.0 → 4.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 256100625c3c7f06417bd59536d4c12d9b89397c
-  data.tar.gz: 7998d37f7925632ef5df017d87c96cbed3641b79
+  metadata.gz: f2109ea21b64b97b4f7c9893b7e1e7f230414385
+  data.tar.gz: 1c8a960a0321583368219a23ff3b6d39dc1a17f1
 SHA512:
-  metadata.gz: f51daaba203995014fe5f2158860c8bc26812d762461eb1f4c161b6ddc9205b61d705d1d9992dc17f0fe9240b634b225c2d96107e1af031a5626ce71c2f3a2e0
-  data.tar.gz: 554fe042832d538069b6e21f1bea5121d7328fc58016f4a7e7277a9ca0e74143c6565265813afc174c22f71825f48257570dff7bdbda24ad4f9d5a4543f802b3
+  metadata.gz: b39fb6c6a5c005b8037465a2b15e861d5e26abfc45725c653185563c03d2359b61e9667eefe0cb96ab73f4233644274846fcd81b6c40e3bd64093ec06d9a29dc
+  data.tar.gz: 0e0f2cd42cf703fa6e5e845b0e671ec210670eefcacafcf635ebd1eb516d9982b6bfe57bf06e372638f39539adcb9c2657ce7bceefbc63c5ec3fa816ada7bf7e

data/exe/cp8

@@ -15,7 +15,7 @@ module Cp8Cli
     desc "submit", "Pushes branch to GitHub and opens a PR"
     method_option :wip, desc: "Flag PR as WIP", type: :boolean
     def submit
-      main.finish(options.to_h.symbolize_keys)
+      main.submit(options.to_h.symbolize_keys)
     end
 
     desc "open", "Open current story in browser"

data/exe/git-finish

@@ -16,4 +16,4 @@ EOS
   opt :wip, "Open [WIP] PR"
 end
 
-Cp8Cli::Main.new.finish(options)
+Cp8Cli::Main.new.submit(options)

data/lib/cp8_cli/branch.rb

@@ -15,7 +15,11 @@ module Cp8Cli
     end
 
     def self.from_story(user:, story:)
-      new BranchName.new(user: user, target: current.target, story: story).to_s
+      new BranchName.new(
+        user: user,
+        target: current.target,
+        story: story
+      ).to_s
     end
 
     def checkout
@@ -27,7 +31,7 @@ module Cp8Cli
     end
 
     def open_pull_request(options = {})
-      pr = PullRequest.new options.reverse_merge(story: current_story, from: name, target: target)
+      pr = PullRequest.new options.reverse_merge(story: current_story, from: name, target: pull_request_target)
       pr.open
     end
 
@@ -74,5 +78,17 @@ module Cp8Cli
       def name_parts
         @_name_parts ||= name.split(".")
       end
+
+      def pull_request_target
+        if plain_branch?
+          "master"
+        else
+          target
+        end
+      end
+
+      def plain_branch?
+        name_parts.size == 1
+      end
   end
 end

data/lib/cp8_cli/main.rb

@@ -26,7 +26,7 @@ module Cp8Cli
       Branch.current.open_story_in_browser
     end
 
-    def finish(options = {})
+    def submit(options = {})
       branch = Branch.current
       branch.push
       branch.open_pull_request(options)

data/lib/cp8_cli/version.rb

@@ -1,5 +1,5 @@
 module Cp8Cli
-  VERSION = "4.2.0"
+  VERSION = "4.2.1"
 
   class Version
     def self.latest?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cp8_cli
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 4.2.1
 platform: ruby
 authors:
 - Jens Balvig
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-20 00:00:00.000000000 Z
+date: 2017-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler