cp8_cli 4.1.3 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04d95eb51cfbf4608faa4834eb532b56a1b35ffa
-  data.tar.gz: d6eb47f0fe8281a81d4aa6dfcc797eba6a83af05
+  metadata.gz: 256100625c3c7f06417bd59536d4c12d9b89397c
+  data.tar.gz: 7998d37f7925632ef5df017d87c96cbed3641b79
 SHA512:
-  metadata.gz: b458e7fa660542602f8e3a4a5dc5ba5686be81c96d3fd8777e372024725cc800b65a2b48c35712f66fa76c78dc60cc969a8387b5737f699dfa1710745a92f372
-  data.tar.gz: 7a4c7cc95f6e56396a05de2555c569e319dc0de5badc5412e25d4455293ae4aad83394a1f409afe76a0254e6641672ef5b0ebde0177e12c3667997588bce0f62
+  metadata.gz: f51daaba203995014fe5f2158860c8bc26812d762461eb1f4c161b6ddc9205b61d705d1d9992dc17f0fe9240b634b225c2d96107e1af031a5626ce71c2f3a2e0
+  data.tar.gz: 554fe042832d538069b6e21f1bea5121d7328fc58016f4a7e7277a9ca0e74143c6565265813afc174c22f71825f48257570dff7bdbda24ad4f9d5a4543f802b3

data/exe/cp8

@@ -28,6 +28,11 @@ module Cp8Cli
       main.ci
     end
 
+    desc "suggest", "Creates a random branch from current commit, pushes it, and resets `master` back to `origin/master`."
+    def suggest
+      main.suggest
+    end
+
     private
 
       def main

data/lib/cp8_cli/branch.rb

@@ -27,7 +27,7 @@ module Cp8Cli
     end
 
     def open_pull_request(options = {})
-      pr = PullRequest.new options.merge(story: current_story, from: name, target: target)
+      pr = PullRequest.new options.reverse_merge(story: current_story, from: name, target: target)
       pr.open
     end
 
@@ -47,6 +47,18 @@ module Cp8Cli
       name_parts[2] || name
     end
 
+    def reset
+      if Command.read("git status --porcelain")
+        Command.error "Dirty working directory, not resetting."
+      else
+        Command.run("git reset --hard origin/#{name}")
+      end
+    end
+
+    def to_s
+      name
+    end
+
     private
 
       attr_reader :name

data/lib/cp8_cli/main.rb

@@ -36,6 +36,16 @@ module Cp8Cli
       Branch.current.open_ci
     end
 
+    def suggest
+      original_branch = Branch.current
+      suggestion_branch = Branch.new("suggestion-#{SecureRandom.hex(8)}")
+      suggestion_branch.checkout
+      suggestion_branch.push
+      suggestion_branch.open_pull_request(target: original_branch, expand: false)
+      original_branch.checkout
+      original_branch.reset
+    end
+
     def cleanup
       Cleanup.new(Branch.current.target).run
     end

data/lib/cp8_cli/pull_request.rb

@@ -2,10 +2,11 @@ require "cp8_cli/repo"
 
 module Cp8Cli
   class PullRequest
-    def initialize(from:, target:, story: nil, **options)
+    def initialize(from:, target:, story: nil, expand: true, **options)
       @story = story
       @from = from
-      @target = target
+      @target = target.to_s
+      @expand = expand
       @options = options
     end
 
@@ -15,10 +16,16 @@ module Cp8Cli
 
     private
 
-      attr_reader :story, :from, :target, :options
+      attr_reader :story, :from, :target, :expand, :options
 
       def url
-        repo.url + "/compare/#{target}...#{escape from}?expand=1&title=#{escape title_with_prefixes}&body=#{escape body}"
+        repo.url + "/compare/#{target}...#{escape from}?title=#{escape title_with_prefixes}&body=#{escape body}#{expand_query}"
+      end
+
+      def expand_query
+        if expand
+          "&expand=1"
+        end
       end
 
       def title

data/lib/cp8_cli/version.rb

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

metadata

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