plunger 0.0.1 → 0.0.2

data/README.md

@@ -2,9 +2,28 @@
 
 # Plunger
 
-Plumber is code review tool.
+Plunger is code review tool for Google Code Reviews.
 
-Its ruby wrapper for [Rietveld Code Review, hosted on Google App Engine](http://code.google.com/p/rietveld/)
+Basically it's ruby wrapper for [Rietveld](http://code.google.com/p/rietveld/) upload.py tool.
+
+## Goals
+
+* Automated original upload tool installation and configuration
+* Automated changeset generation with description/title/reviewers etc...
+
+Supported VCS:
+
+* git
+
+## Install
+
+Install tool:
+
+    gem install plunger
+
+Configure google code review for your organization:
+
+See [Using Code Reviews with Google Apps](http://code.google.com/p/rietveld/wiki/CodeReviewHelp#Using_Code_Reviews_with_Google_Apps)
 
 ## Commands
 
@@ -12,10 +31,23 @@ To see all commands:
 
     plunger --help
 
-### Configure
+### Configure command
 
 Synopsis:
 
     plunger configure
 
-It will ask your about required options and store configuration to ~/.gem/plumber
+It will ask your about required options and store configuration to *~/.gem/plunger*
+
+### Push command
+
+Synopsis:
+
+    plunger push
+
+## Developer Flow
+
+* Go to your VCS project and optionally switch to your working branch.
+* Finish feature/fix implementation.
+* Type ``plunger push``.
+* Follow instructions and it generate and push changeset to codereview server.

data/lib/plunger/changeset/git.rb

@@ -0,0 +1,62 @@
+require 'posix/spawn'
+
+module Plunger
+  module Changeset
+    class Git
+      class << self
+        def detected?
+          Dir.exists?('.git')
+        end
+
+        def command
+          Config.data['git_bin'] || 'git'
+        end
+
+        def initial_revision
+          'origin/master'
+        end
+
+        def final_revision
+          revision = Command.spawn_result("#{command} symbolic-ref -q HEAD").strip.split('/').last
+          "origin/#{revision}"
+        end
+      end
+
+      def initialize(initial, final)
+        @range = "#{initial}..#{final}"
+      end
+
+      attr_reader :range
+
+      def repository_name
+        @repository_name ||= File.split(File.expand_path('.')).last
+      end
+
+      def message
+        @message ||= "[#{repository_name}] #{range}"
+      end
+
+      def description
+        @description ||= Command.spawn_result("#{self.class.command} log --pretty='%s' #{range}")
+      end
+
+      def empty?
+        description.empty?
+      end
+
+      def author_emails
+        @author_emails ||= Command.spawn_result("#{self.class.command} log --pretty='%ae' #{range}").
+          split("\n").
+          map { |email| email.strip }.
+          uniq
+      end
+
+      def commiter_emails
+        @commiter_emails ||= Command.spawn_result("#{self.class.command} log --pretty='%ce' #{range}").
+          split("\n").
+          map { |email| email.strip }.
+          uniq
+      end
+    end
+  end
+end

data/lib/plunger/changeset.rb

@@ -0,0 +1,17 @@
+require 'plunger/changeset/git'
+
+module Plunger
+  module Changeset
+
+    class << self
+      def classes
+        [Git]
+      end
+
+      def detect_class
+        self.classes.find { |klass| klass.detected? }
+      end
+    end
+
+  end
+end

data/lib/plunger/command/configure.rb

@@ -13,59 +13,38 @@ module Plunger
         end
 
         def autorun?
-          !File.exists?(config_path)
-        end
-
-        def config_path
-          @config_path ||= File.join(Gem.user_home, '.gem', 'plunger')
+          !Config.exists?
         end
       end
 
       def run
-        ui.say "Please configure plunger"
+        Command.ui.say "Please configure plunger (enter nothing if you don't want to change option)"
+
         [
-          ['server', 'Code review server', 'coderev.railsware.com'],
-          ['python_bin', 'Path to python v2 binary', 'python']
+          ['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_option(*args)
+          configure(*args)
         end
 
-        save_configuration
-        ui.say "Configuration saved to #{config_path}"
-      end
-
-      protected
+        Plunger::Config.save
 
-      def ui
-        @ui ||= Gem::ConsoleUI.new
-      end
+        Command.ui.say "Configuration saved to #{Plunger::Config.path}"
 
-      def config_path
-        self.class.config_path
+        true
       end
 
-      def configuration
-        @configuration ||= Gem.configuration.load_file(config_path)
-      end
-
-      def configure_option(name, description, default)
-        configuration[name] ||= default
-        value = configuration[name]
-        value = ui.ask("#{description} (#{value}):")
-        configuration[name] ||= default 
-        configuration[name] = value unless value.empty?
-      end
-
-      def save_configuration
-        dirname = File.dirname(config_path)
-
-        Dir.mkdir(dirname) unless File.exists?(dirname)
+      protected
 
-        File.open(config_path, 'w') do |f|
-          f.write configuration.to_yaml
-        end
+      def configure(name, description, default)
+        Plunger::Config.data[name] ||= default
+        value = Plunger::Config.data[name]
+        value = Command.ui.ask("#{description} (#{value}):")
+        Plunger::Config.data[name] = value unless value.empty?
       end
-
     end
   end
 end

data/lib/plunger/command/push.rb

@@ -16,7 +16,52 @@ module Plunger
       end
 
       def run
-        p "PUSH"
+        unless changeset_class = Changeset.detect_class
+          Command.ui.say("Can't detect SCM")
+          return false
+        end
+
+        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}):")
+          revision.empty? ? default : revision
+        end
+
+        changeset = changeset_class.new(*revisions)
+
+        changeset.empty? and abort("Changeset #{changeset.range} is empty")
+
+        message     = changeset.title
+        description = changeset.description
+        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
+
+        issue = Command.ui.ask("Issue number (omit to create new issue):")
+
+        reviewers +=
+          Command.ui.ask("Specify another reviewers (comma separated email addresses):").
+          split(',').
+          map { |reviewer| reviewer.strip }
+
+        Uploader.new.run({
+          'server'      => Config.data['server'],
+          'email'       => Config.data['email'],
+          'issue'       => issue,
+          'send_mail'   => true,
+          'message'     => message,
+          'description' => description,
+          'reviewers'   => reviewers.uniq.join(',')
+        }, [
+          changeset.range
+        ])
       end
     end
   end

data/lib/plunger/command/upgrade.rb

@@ -1,3 +1,5 @@
+require 'rubygems/dependency_installer'
+
 module Plunger
   module Command
     class Upgrade
@@ -11,12 +13,28 @@ module Plunger
         end
 
         def autorun?
-          false
+          true
         end
       end
 
       def run
-        p "UPGRADE"
+        Command.ui.say("Checking plunger update ...")
+
+        req = Gem::Requirement.new(">#{Plunger::VERSION}")
+        dep = Gem::Dependency.new('plunger', req)
+        tuples = Gem::SpecFetcher.fetcher.fetch(dep)
+
+        if tuples.empty?
+          Command.ui.say("Plunger is up to date")
+        else
+          spec, source = tuples.first
+          Command.ui.say("Upgrading #{Plunger::VERSION} to #{spec.version}")
+          installer = Gem::DependencyInstaller.new
+          installer.install(spec.name, spec.version.to_s)
+          exit
+        end
+
+        true
       end
     end
   end

data/lib/plunger/command.rb

@@ -22,6 +22,16 @@ module Plunger
       def command_class(name)
         Plunger::Command.const_get(Utils.camelize(name))
       end
+
+      def ui
+        @ui ||= Gem::ConsoleUI.new
+      end
+
+      def spawn_result(command)
+        result = POSIX::Spawn.`(command)
+        $?.success? or abort
+        result
+      end
     end
   end
 end

data/lib/plunger/config.rb

@@ -0,0 +1,32 @@
+module Plunger
+  class Config
+    class << self
+      def exists?
+        File.exists?(path)
+      end
+
+      def path
+        @path ||= File.join(Gem.user_home, '.gem', 'plunger')
+      end
+
+      def load
+        Gem.configuration.load_file(path)
+      end
+
+      def save
+        dirname = File.dirname(path)
+
+        Dir.mkdir(dirname) unless File.exists?(dirname)
+
+        File.open(path, 'w') do |f|
+          f.write data.to_yaml
+        end
+      end
+
+      def data
+        @data ||= self.load
+      end
+    end
+  end
+end
+

data/lib/plunger/runner.rb

@@ -37,7 +37,7 @@ module Plunger
       end
 
       Command.autorun
-      Command.run(@command)
+      Command.run(@command) or abort
     end
 
   end

data/lib/plunger/uploader.rb

@@ -0,0 +1,98 @@
+require 'posix/spawn'
+
+module Plunger
+  class Uploader
+
+    def command
+      Config.data['python_bin'] || 'python'
+    end
+
+    def script
+      File.expand_path('../../../python/upload.py', __FILE__)
+    end
+
+    def run(options, diff_options = nil)
+      argvs = [ script ]
+
+      options.each do |key, value|
+        case value
+        when true
+          argvs << "--#{key}"
+        when false
+        else
+          argvs << "--#{key}" << "#{value}" unless value.to_s.empty?
+        end
+      end
+
+      diff_options = Array(diff_options)
+
+      unless diff_options.empty?
+        argvs << '--'
+        argvs += diff_options
+      end
+
+      POSIX::Spawn.system(command, *argvs)
+    end
+
+  end
+end
+
+=begin
+
+python2 python/upload.py -h
+
+Usage: upload.py [options] [-- diff_options] [path...]
+
+Options:
+-h --help               Show this help message and exit.
+-y --assume_yes         Assume that the answer to yes/no questions is 'yes'.
+
+Logging options:
+  -q --quiet            Print errors only.
+  -v --verbose          Print info level logs.
+  --noisy               Print all logs.
+  --print_diffs         Print full diffs.
+
+Review server options:
+  -s --server SERVER    The server to upload to. The format is host[:port].
+                        Defaults to 'codereview.appspot.com'.
+  -e --email EMAIL      The username to use. Will prompt if omitted.
+  -H --host HOST        Overrides the Host header sent with all RPCs.
+  --no_cookies          Do not save authentication cookies to local disk.
+  --account_type TYPE   Override the default account type (defaults to
+                        'GOOGLE', valid choices are 'GOOGLE' and 'HOSTED').
+
+Issue options:
+  -d --description DESCRIPTION
+                        Optional description when creating an issue.
+  -f --description_file DESCRIPTION_FILE
+                        Optional path of a file that contains the description
+                        when creating an issue.
+  -r --reviewers REVIEWERS
+                        Add reviewers (comma separated email addresses).
+  --cc CC               Add CC (comma separated email addresses).
+  --private             Make the issue restricted to reviewers and those CCed
+
+Patch options:
+  -m --message MESSAGE  A message to identify the patch. Will prompt if
+                        omitted.
+  -i --issue ISSUE      Issue number to which to add. Defaults to new issue.
+  --base_url BASE_URL   Base URL path for files (listed as "Base URL" when
+                        viewing issue).  If omitted, will be guessed
+                        automatically for SVN repos and left blank for others.
+  --download_base       Base files will be downloaded by the server (side-by-
+                        side diffs may not work on files with CRs).
+  --rev REV             Base revision/branch/tree to diff against. Use
+                        rev1:rev2 range to review already committed changeset.
+  --send_mail           Send notification email to reviewers.
+  -p --send_patch       Same as --send_mail, but include diff as an
+                        attachment, and prepend email subject with 'PATCH:'.
+  --vcs VCS             Version control system (optional, usually upload.py
+                        already guesses the right VCS).
+  --emulate_svn_auto_props
+                        Emulate Subversion's auto properties feature.
+
+Use '--help -v' to show additional Perforce options.
+
+=end
+

data/lib/plunger/version.rb

@@ -1,3 +1,3 @@
 module Plunger
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/plunger.rb

@@ -1,7 +1,10 @@
 require "plunger/version"
 
 module Plunger
-  autoload :Runner,  'plunger/runner'
-  autoload :Command, 'plunger/command'
-  autoload :Utils,   'plunger/utils'
+  autoload :Runner,    'plunger/runner'
+  autoload :Changeset, 'plunger/changeset'
+  autoload :Command,   'plunger/command'
+  autoload :Config,    'plunger/config'
+  autoload :Uploader,  'plunger/uploader'
+  autoload :Utils,     'plunger/utils'
 end

data/plunger.gemspec

@@ -18,5 +18,5 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency "grit", "2.4.1"
+  s.add_dependency "posix-spawn", "0.3.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: plunger
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,19 +9,19 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-18 00:00:00.000000000Z
+date: 2011-10-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: grit
-  requirement: &19227280 !ruby/object:Gem::Requirement
+  name: posix-spawn
+  requirement: &25420280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
       - !ruby/object:Gem::Version
-        version: 2.4.1
+        version: 0.3.6
   type: :runtime
   prerelease: false
-  version_requirements: *19227280
+  version_requirements: *25420280
 description: Ruby Wrapper for Rietveld Code Review, hosted on Google App Engine
 email:
 - andriy.yanko@gmail.com
@@ -37,11 +37,15 @@ files:
 - Rakefile
 - bin/plunger
 - lib/plunger.rb
+- lib/plunger/changeset.rb
+- lib/plunger/changeset/git.rb
 - lib/plunger/command.rb
 - lib/plunger/command/configure.rb
 - lib/plunger/command/push.rb
 - lib/plunger/command/upgrade.rb
+- lib/plunger/config.rb
 - lib/plunger/runner.rb
+- lib/plunger/uploader.rb
 - lib/plunger/utils.rb
 - lib/plunger/version.rb
 - plunger.gemspec