stash_cli 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 931c61d232560cf1f0856f572593ca263678ca6b
-  data.tar.gz: 893734422c626f819e62a439dc5fcfd7979e3bee
+  metadata.gz: f505b77639435a60bae3d100184b246ed1aeaf05
+  data.tar.gz: 08596d623cec3e7e1f9e7b721a12d60fe014101e
 SHA512:
-  metadata.gz: f9cc90eacaefb56234afac09cf317317987a33924bcf8568ca6b8f61c07508cc8f0418a2cda06890eb5ee15cd5258ad6656684007ddac1b009cacbf0375754e5
-  data.tar.gz: 726a4ef25274d611fbae04b0fb9077b434296b470c47933e4a47f2c561aa9c2138361971bf254b6b88b1e1c286b19ca34cdc24722e7e6ece0e7769842423747b
+  metadata.gz: d38cdd82a8132ed90ec4851047c5d909e27e1fa6ea2e8c658a41e53ad628b959455c5db013245b9cff6a6373a119fdca3a3aa9bb38ce068f735abe95a8fa314b
+  data.tar.gz: 5c41740976525594f21beef3832b9b8b2eb748f74ef005d27765916858b710d68c685c1a0f0c54986e6fcbffdedd97092ac807f260763642942a0142575d2628

data/lib/stash_cli/cli.rb

@@ -47,6 +47,11 @@ module StashCLI
       say "verify configuration in #{dest}"
     end
 
+    desc 'commits SRC_BRANCH', 'list commits since source branch'
+    def commits(src_branch)
+      say GitUtils.commits_from_branch(src_branch)
+    end
+
     desc 'users', 'list users'
     def users
       configure
@@ -154,13 +159,22 @@ module StashCLI
 
     protected
 
-    def get_description
+    def get_description(target_branch)
+      default_description = GitUtils.commits_from_branch(target_branch)
+
       if options[:long_description]
+        if ENV['EDITOR'].nil? or ENV['EDITOR'].empty?
+          say 'using --long-description but $EDITOR not set. Aborting.'
+          exit 1
+        end
+
         if options[:interactive]
-          say 'getting description via editor'
+          say 'getting description via $EDITOR'
         end
 
         tmpfile = File.join('/tmp', "pull_request_desc_#{Time.now.to_i}")
+        File.open(tmpfile, 'w') { |f| f.puts default_description }
+
         system(ENV['EDITOR'], tmpfile)
 
         if File.exists?(tmpfile)
@@ -168,21 +182,17 @@ module StashCLI
           File.delete(tmpfile)
           return contents
         else
-          say 'Aborting due to empty description'
+          say 'Aborting due to missing description'
           exit 1
         end
       elsif options[:interactive]
         description = ask("description [#{options[:description]}]:").strip
-        if description.empty?
-          return nil
-        end
-
-        return description
+        return description unless description.empty?
       end
 
-
       return options[:description] if options[:description]
-      nil
+
+      return default_description
     end
 
     def initial_reviewers
@@ -232,18 +242,20 @@ module StashCLI
         reviewers: reviewers
       }
 
-      description = get_description
+      description = get_description(opts[:target_branch])
+
       opts[:description] = description if description
 
       opts
     end
 
     def interactive_pr(title)
-      description = get_description
 
       target_branch =
         ask("target branch [#{configatron.defaults.target_branch}]:").strip
 
+      description = get_description(target_branch)
+
       target_branch = configatron.defaults.target_branch if target_branch.empty?
 
       reviewers = initial_reviewers

data/lib/stash_cli/git_utils.rb

@@ -3,5 +3,10 @@ module StashCLI
     def self.current_branch
       `git rev-parse --abbrev-ref HEAD`.strip
     end
+
+    def self.commits_from_branch(source_branch)
+      current_branch = GitUtils.current_branch
+      `git log --oneline #{source_branch}..#{current_branch} | cat`.strip
+    end
   end
 end

data/lib/stash_cli/version.rb

@@ -1,3 +1,3 @@
 module StashCli
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stash_cli
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Matt Chun-Lum
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-25 00:00:00.000000000 Z
+date: 2016-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: configatron