plunger 0.0.6 → 0.0.7

data/README.md

@@ -45,6 +45,12 @@ Synopsis:
 
     plunger push
 
+    Push options:
+        --initial REVISION           Initial changeset revision.
+        --final REVISION             Final changeset revision.
+        --issue NUMBER               Issue number to which to add. Defaults to new issue.
+
+
 ## Developer Flow
 
 * Go to your VCS project and optionally switch to your working branch.

data/config/configure_options.yml

@@ -0,0 +1,24 @@
+---
+- key: python_bin
+  value: python
+  description: Path to python v2 binary
+
+- key: git_bin
+  value: git
+  description: Path to git binary
+
+- key: server
+  value: coderev.railsware.com
+  description: Code review server
+
+- key: domain
+  value: railsware.com
+  description: Google app domain
+
+- key: username
+  value: vasya.pupkin
+  description: Google app username
+
+- key: master_reviewer
+  value: product_manager
+  description: Master reviewer username

data/lib/plunger/changeset/git.rb

@@ -10,6 +10,10 @@ module Plunger
           Config.data['git_bin'] || 'git'
         end
 
+        def sync_repository(remote = 'origin')
+          system("#{self.command} fetch #{remote}")
+        end
+
         def initial_revision
           'origin/master'
         end
@@ -21,10 +25,15 @@ module Plunger
       end
 
       def initialize(initial, final)
-        @range = "#{initial}..#{final}"
+        @initial = initial
+        @final = final
       end
 
-      attr_reader :range
+      attr_reader :initial, :final
+
+      def range
+        @range = "#{initial}..#{final}"
+      end
 
       def repository_name
         @repository_name ||= File.split(File.expand_path('.')).last
@@ -55,6 +64,20 @@ module Plunger
           map { |email| email.strip }.
           uniq
       end
+
+      def initial_commits_count
+        @initial_commits_count ||= 
+          Command.spawn_result("#{self.class.command} rev-list #{initial} ^#{final}").split("\n").
+          size.
+          to_i
+      end
+
+      def final_commits_count
+        @final_commits_count ||= 
+          Command.spawn_result("#{self.class.command} rev-list ^#{initial} #{final}").split("\n").
+          size.
+          to_i
+      end
     end
   end
 end

data/lib/plunger/command/configure.rb

@@ -1,3 +1,5 @@
+require 'yaml'
+
 module Plunger
   module Command
     class Configure
@@ -15,17 +17,23 @@ module Plunger
         end
       end
 
-      def run
+      def config_file
+        File.expand_path('../../../../config/configure_options.yml', __FILE__)
+      end
+
+      def configure_options
+        YAML.load_file(config_file)
+      end
+
+      def run(options)
         Command.ui.say "Please configure plunger (enter nothing if you don't want to change option)"
 
-        [
-          ['server',     'Code review server',       'coderev.railsware.com'     ],
-          ['domain',     'Google app domain',        'railsware.com'             ],
-          ['email',      'Google app email',         'vasya.pupkin@railsware.com'],
-          ['python_bin', 'Path to python v2 binary', 'python'                    ],
-          ['git_bin',    'Path to git binary',       'git'                       ]
-        ].each do |args|
-          configure(*args)
+        configure_options.each do |option|
+          configure(
+            option['key'],
+            option['description'],
+            option['value']
+          )
         end
 
         Plunger::Config.save

data/lib/plunger/command/push.rb

@@ -15,17 +15,20 @@ module Plunger
         end
       end
 
-      def run
+      def run(options)
         unless changeset_class = Changeset.detect_class
           Command.ui.say("Can't detect SCM")
           return false
         end
 
+        Command.ui.say("Synchronizing repository...")
+        changeset_class.sync_repository
+
         revisions = [
-          [changeset_class.initial_revision, "initial" ],
-          [changeset_class.final_revision,   "final"   ]
-        ].map do |default, description|
-          revision = Command.ui.ask("Specify #{description} revision or reference (#{default}):")
+          [changeset_class.initial_revision, :initial ],
+          [changeset_class.final_revision,   :final   ]
+        ].map do |default, type|
+          revision = options[type] || Command.ui.ask("Specify #{type} revision or reference (#{default}):")
           revision.empty? ? default : revision
         end
 
@@ -33,26 +36,38 @@ module Plunger
 
         changeset.empty? and abort("Changeset #{changeset.range} is empty")
 
+        unless changeset.initial_commits_count.zero?
+          message = "Revision '#{changeset.initial}' contains #{changeset.initial_commits_count} commits that are NOT into '#{changeset.final}' revision! Continue (y/n)"
+          Command.ui.ask(message) == 'y' or abort
+        end
+
+        reviewers = normalize_reviewers(Config.data['master_reviewer'])
+
         message     = changeset.message
         description = changeset.description
-        reviewers   = filter_reviewers(changeset.author_emails)
+        reviewers   += filter_reviewers(changeset.author_emails)
 
-        if reviewers.empty?
-          Command.ui.say("No reviewers detected")
-        else
-          Command.ui.say("Found reviewers in the changeset:")
-          reviewers.each { |reviewer| Command.ui.say(reviewer) }
-        end
+        Command.ui.say("Next reviewers will be notified:")
+        reviewers.each { |reviewer| Command.ui.say(reviewer) }
 
         reviewers += normalize_reviewers(
           Command.ui.ask("Specify another reviewers (comma separated email addresses or just names):")
         )
 
-        issue = Command.ui.ask("Issue number (omit to create new issue):")
+        issue = options[:issue] || Command.ui.ask("Issue number (omit to create new issue):")
+
+        confirmation = "Push changeset '#{message}' "
+        if issue.empty?
+          confirmation << "to NEW issue"
+        else
+          confirmation << "to issue##{issue}"
+        end
+        confirmation << " for code review? (y/n)"
+        Command.ui.ask(confirmation) == 'y' || abort
 
         Uploader.new.run({
           'server'      => Config.data['server'],
-          'email'       => Config.data['email'],
+          'email'       => Config.email,
           'issue'       => issue,
           'send_mail'   => true,
           'message'     => message,

data/lib/plunger/command/upgrade.rb

@@ -17,7 +17,7 @@ module Plunger
         end
       end
 
-      def run
+      def run(options)
         Command.ui.say("Checking plunger update ...")
 
         req = Gem::Requirement.new(">#{Plunger::VERSION}")

data/lib/plunger/command.rb

@@ -13,12 +13,12 @@ module Plunger
 
       def autorun
         names.each do |name|
-          run(name) if command_class(name).autorun?
+          run(name, {}) if command_class(name).autorun?
         end
       end
 
-      def run(name)
-        command_class(name).new.run
+      def run(name, options)
+        command_class(name).new.run(options)
       end
 
       def command_class(name)

data/lib/plunger/config.rb

@@ -26,6 +26,10 @@ module Plunger
       def data
         @data ||= self.load
       end
+
+      def email
+        data['username'] << '@' << data['domain']
+      end
     end
   end
 end

data/lib/plunger/runner.rb

@@ -4,11 +4,12 @@ module Plunger
   class Runner
     def initialize(argv)
       @argv = argv
+      @options = {}
     end
 
     def run!
       @parser = OptionParser.new do |o|
-        o.banner = "Usage: plunger [options] #{Command.names.join('|')}"
+        o.banner = "Usage: plunger #{Command.names.join('|')} [options]"
 
         o.separator ""
         o.separator "Commands:"
@@ -18,6 +19,12 @@ module Plunger
           o.separator "    %-20s %s" % [klass.command, klass.description]
         end
 
+        o.separator ""
+        o.separator "Push options:"
+        o.on("--initial REVISION", "Initial changeset revision.") { |v| @options[:initial] = v }
+        o.on("--final REVISION", "Final changeset revision.")     { |v| @options[:final]   = v }
+        o.on("--issue NUMBER", "Issue number to which to add. Defaults to new issue.") { |v| @options[:issue] = v }
+
         o.separator ""
         o.separator "Common options:"
         o.on_tail("-h", "--help", "Show this message") { puts o; exit }
@@ -37,7 +44,7 @@ module Plunger
       end
 
       Command.autorun
-      Command.run(@command) or abort
+      Command.run(@command, @options) or abort
     end
 
   end

data/lib/plunger/version.rb

@@ -1,3 +1,3 @@
 module Plunger
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: plunger
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Andriy Yanko
@@ -35,6 +35,7 @@ files:
 - README.md
 - Rakefile
 - bin/plunger
+- config/configure_options.yml
 - lib/plunger.rb
 - lib/plunger/changeset.rb
 - lib/plunger/changeset/git.rb