pullrequest 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51a50bd60f262b845aba22d34f1e3cbcccfb315d
-  data.tar.gz: 6a4c6da5da6a65c26c8120e806663c55d94f8316
+  metadata.gz: ba700fdf8961d0cf9c3d6002c65abe42ac2dd9ae
+  data.tar.gz: ab3e8846ac4962e113e36a3fd5b6ea6b85671811
 SHA512:
-  metadata.gz: 48f6154a1b06a34dd1068732f767caacfd1c65b2f06498862d4d8e614616a3323250b450b8e346553527b0d4653c504c9a0ed190cd835b01aa13d8b81c726523
-  data.tar.gz: f26f73b224862a45fd68c8ac62fb32afb5f2c5589543b53e9818336e7a9650be876a27ebd299c074dd70ef3e41f759b5af9cd4c9191e1118e20f06b535f703a3
+  metadata.gz: dc997522583e766cfe9923500db0333c2d68ee0fc7dd061d602da1f0edc4fb5db9fb5352fadf81bab3df9db42fd58a7db9e3170cd448d369676574b9b27ae922
+  data.tar.gz: 3707adafefdc5ad7ad5081e381e639a9e5b8d5b1853f37f63c0c0bdceb17011250a26ac7b401ba109f8fb13c756f50d3842c06fafb334cd5bf1afee4d32c4f8f

data/README.md

@@ -13,13 +13,6 @@ CLI for submitting Bitbucket pull requests
 You will be prompted to enter details for your pull request.
 The command will be shown before asking confirmation to execute it.
 
-## TODO
-
-* Add `pullrequest` to path
-* Add review option at confirmation (start again with previous answers as defaults).
-* Optionally cache Bitbucket credentials.
-* Add GitHub support.
-
 ## Contributing
 
 1. Fork it ( https://github.com/zubin/pullrequest/fork )

data/exe/pullrequest

@@ -9,26 +9,36 @@ require 'pullrequest/thor'
 module Pullrequest
   class CLI < Thor
     include Pullrequest::Shell
+    Aborted = Class.new(StandardError)
 
-    no_commands do
-      def command
-        @command ||= repo_class.new(self).command
+    desc "submit", "Submits Bitbucket pull request"
+    def submit
+      begin
+        command
+        if yes? "Print command?"
+          $stdout.puts command
+        end
+        if yes? "Proceed?"
+          execute command
+        else
+          raise Aborted
+        end
+      rescue Aborted
+        if yes? "Review?"
+          pullrequest.review
+          retry
+        end
       end
+    end
 
-      def repo_class
-        Bitbucket
-      end
+    private
+
+    def command
+      pullrequest.command
     end
 
-    desc "submit", "Submits pull request"
-    def submit
-      command
-      if yes? "Print command?"
-        $stdout.puts command
-      end
-      if yes? "Proceed?"
-        execute command
-      end
+    def pullrequest
+      @pullrequest ||= Bitbucket.new(self)
     end
   end
 end

data/lib/pullrequest/bitbucket.rb

@@ -1,5 +1,7 @@
+require 'fileutils'
 require 'json'
 require 'thor'
+require 'yaml'
 
 module Pullrequest
   class Bitbucket
@@ -10,21 +12,28 @@ module Pullrequest
     end
 
     def command
-      data # ask these questions first
-      [
-        "curl",
-        "-X POST",
-        "-H 'Content-Type: application/json'",
-        "-u #{username}:#{password}",
-        "https://bitbucket.org/api/2.0/repositories/#{dest_repo}/pullrequests",
-        "-d '#{data.to_json}'",
-      ].join(' ')
+      @command ||= generate_command
+    end
+
+    def review
+      @data = nil
+      @command = nil
     end
 
     private
 
-    def ask(*args)
-      context.ask *args
+    def ask(question, options = {})
+      cache_key = question.dup
+      if cached_answers[cache_key]
+        options.merge! default: cached_answers[cache_key]
+      end
+      context.ask(question, options).tap do |answer|
+        cached_answers[cache_key] = answer
+      end
+    end
+
+    def cached_answers
+      @cached_answers ||= {}
     end
 
     def current_branch
@@ -37,8 +46,8 @@ module Pullrequest
 
     def data
       @data ||= {
-        title: ask("Title of pull request", required: true),
-        description: ask("Description of pull request"),
+        title: title,
+        description: description,
         source: {
           repository: {full_name: source_repo},
           branch: {name: source_branch},
@@ -52,6 +61,10 @@ module Pullrequest
       }
     end
 
+    def description
+      ask("Description of pull request")
+    end
+
     def dest_branch
       ask("Destination branch", default: 'master', required: true)
     end
@@ -60,9 +73,26 @@ module Pullrequest
       ask("Destination Bitbucket repo (account_name/report_name)", default: current_repo, required: true)
     end
 
+    def generate_command
+      data # ask these questions first
+      [
+        "curl",
+        "-X POST",
+        "-H 'Content-Type: application/json'",
+        "-u #{username}:#{password}",
+        "https://bitbucket.org/api/2.0/repositories/#{dest_repo}/pullrequests",
+        "-d '#{data.to_json}'",
+      ].join(' ')
+    end
+
     def password
-      ask("Your Bitbucket password", echo: false, required: true).tap do
+      return stored_credentials[:password] if stored_credentials?
+      ask("Your Bitbucket password", echo: false, required: true).tap do |password|
         $stdout.puts # force newline
+        if yes? "Store credentials for next time? (in #{stored_credentials_path})"
+          @password = password
+          write_credentials
+        end
       end
     end
 
@@ -74,12 +104,41 @@ module Pullrequest
       current_repo
     end
 
+    def stored_credentials
+      return {} unless File.exists?(stored_credentials_path)
+      @stored_credentials ||= YAML.load(File.read(stored_credentials_path))
+    end
+
+    def stored_credentials?
+      stored_credentials.key?(:username) && stored_credentials.key?(:password)
+    end
+
+    def stored_credentials_path
+      File.join(Dir.home, '.config/pullrequest/bitbucket.yml')
+    end
+
+    def title
+      ask("Title of pull request", required: true)
+    end
+
     def reviewer_usernames
       ask("Reviewers (enter comma-separated usernames)", default: "<none>").split(',').map(&:strip).reject { |u| u == '' }
     end
 
     def username
-      ask "Your Bitbucket username", required: true
+      return stored_credentials[:username] if stored_credentials?
+      @username = ask("Your Bitbucket username", required: true)
+    end
+
+    def write_credentials
+      FileUtils.mkdir_p(File.dirname(stored_credentials_path))
+      File.open(stored_credentials_path, 'w', 0600) do |f|
+        f.write({username: @username, password: @password}.to_yaml)
+      end
+    end
+
+    def yes?(*args)
+      context.yes? *args
     end
   end
 end

data/lib/pullrequest/version.rb

@@ -1,3 +1,3 @@
 module Pullrequest
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/pullrequest.gemspec

@@ -23,4 +23,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 1.9'
   spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'pry'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pullrequest
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Zubin Henner
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-05-03 00:00:00.000000000 Z
+date: 2015-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - zubin@rubidium.com.au