flux 0.0.5 → 0.0.6

data/Gemfile

@@ -5,7 +5,6 @@ source "http://rubygems.org"
 gem "thor", "~> 0.14.0"
 gem "pivotal-tracker", "~> 0.4.0"
 gem "grit", "~> 2.4.0"
-gem 'hirb'
 gem 'github_api'
 
 # Add dependencies to develop your gem here.

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/flux.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "flux"
-  s.version = "0.0.5"
+  s.version = "0.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Leal"]
-  s.date = "2012-02-17"
+  s.date = "2012-02-18"
   s.email = "david@mojotech.com"
   s.executables = ["flux"]
   s.extra_rdoc_files = [
@@ -40,7 +40,9 @@ Gem::Specification.new do |s|
     "lib/flux/rcs/git.rb",
     "lib/flux/util.rb",
     "lib/flux/util/output.rb",
+    "lib/flux/util/table.rb",
     "lib/flux/workflows/mojotech.rb",
+    "spec/flux/util/table_spec.rb",
     "spec/flux_spec.rb",
     "spec/spec_helper.rb",
     "spec/support/rr.rb"
@@ -58,7 +60,6 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<thor>, ["~> 0.14.0"])
       s.add_runtime_dependency(%q<pivotal-tracker>, ["~> 0.4.0"])
       s.add_runtime_dependency(%q<grit>, ["~> 2.4.0"])
-      s.add_runtime_dependency(%q<hirb>, [">= 0"])
       s.add_runtime_dependency(%q<github_api>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
@@ -69,7 +70,6 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<thor>, ["~> 0.14.0"])
       s.add_dependency(%q<pivotal-tracker>, ["~> 0.4.0"])
       s.add_dependency(%q<grit>, ["~> 2.4.0"])
-      s.add_dependency(%q<hirb>, [">= 0"])
       s.add_dependency(%q<github_api>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
@@ -81,7 +81,6 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<thor>, ["~> 0.14.0"])
     s.add_dependency(%q<pivotal-tracker>, ["~> 0.4.0"])
     s.add_dependency(%q<grit>, ["~> 2.4.0"])
-    s.add_dependency(%q<hirb>, [">= 0"])
     s.add_dependency(%q<github_api>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])

data/lib/flux/cli/feature.rb

@@ -5,7 +5,7 @@ module Flux
     class Feature < Thor
       namespace :feature
 
-      desc "start STORY_ID BRANCH_ID", "start working on a story"
+      desc "start STORY_ID BRANCH", "start working on a story"
       method_option :estimate,      :type    => :numeric
       method_option :parent_branch, :type    => :string,
                                     :default => 'master',

data/lib/flux/cli/pivotal_tracker.rb

@@ -2,11 +2,14 @@ require 'pivotal-tracker'
 require 'hirb'
 require 'flux/pivotal_tracker'
 require 'flux/ext/pivotal-tracker'
+require 'flux/util/table'
 require 'forwardable'
 
 module Flux
   module CLI
     class PT < Thor
+      STORY_LIST_HEADERS = %w(>ID STATE ASSIGNEE >EST STORY)
+
       extend  Forwardable
       include Flux::Util
 
@@ -44,10 +47,13 @@ module Flux
 
       desc "list", "list stories, excluding icebox by default"
       def list
-        puts Hirb::Helpers::ObjectTable.render(
-          current_project.stories.scheduled,
-          :fields => [:id, :state, :owned_by, :est, :name]
-        )
+        table =
+          [STORY_LIST_HEADERS] +
+          current_project.stories.scheduled.map { |s|
+            [s.id, s.state, s.owned_by, s.est, s.name]
+          }
+
+        puts_table table
       end
 
       story_update :finish, :current_state => 'finished'

data/lib/flux/cli/review.rb

@@ -5,35 +5,37 @@ require 'github_api'
 module Flux
   module CLI
     class Review < Thor
+      PULL_REQUEST_HEADERS = %w(>NUM >STORY AUTHOR DATE TITLE)
+
+      include Flux::Util
+
       namespace 'review'
 
-      desc "diff", "show interdiff between last 2 reviews"
+      desc "diff [BRANCH]", "show interdiff between last 2 reviews"
       method_option :from,  :type => :numeric, :aliases => '-f'
       method_option :to,    :type => :numeric, :aliases => '-t'
       method_option :color, :type => :boolean, :aliases => '-c'
       def diff(branch_name = Git::Branch.current.name)
-        reqs = pull_requests(:state => 'all', :branch_name => branch_name)
+        reqs = Github::PullRequest.all(:branch_name => branch_name)
 
         if options[:from] && options[:to]
-          to   = reqs.find { |r| r[:number].to_i == options[:to].to_i }
-          from = reqs.find { |r| r[:number].to_i == options[:from].to_i }
+          to   = reqs.find { |r| r.number.to_i == options[:to].to_i }
+          from = reqs.find { |r| r.number.to_i == options[:from].to_i }
         else
           to, from = reqs.first(2)
         end
 
         if from
-          auth = [gh_config['username'], gh_config['password']]
-
           to_diff = Tempfile.new("to_diff")
-          to_diff.write(open(to[:diff_url],
-                               :http_basic_authentication => auth).read)
+          to_diff.write(to.diff)
+          to_diff.flush
 
           from_diff = Tempfile.new("from_diff")
-          from_diff.write(open(from[:diff_url],
-                               :http_basic_authentication => auth).read)
+          from_diff.write(from.diff)
+          from_diff.flush
 
           cmd =  "interdiff #{from_diff.path} #{to_diff.path}"
-          cmd << "| colordiff"
+          cmd << "| colordiff" if options[:color]
 
           system cmd
         end
@@ -43,27 +45,30 @@ module Flux
       def request
         branch = Git::Branch.current
         story  = current_project.stories.find(branch.config('story_id'))
-        body   = {:branch_name => branch.name,
-                  :story_url   => story.url,
-                  :iterations  => iterations(branch.name)}
-        data   = {:base  => 'master',
-                  :head  => branch.commit.sha,
-                  :title => story.name,
-                  :body  => PullRequestBody.to_markdown(body)}
-
-        gh.pull_requests.create_request gh_config['repo_user'],
-                                        gh_config['repo_name'],
-                                        data
+        old    = Github::PullRequest.all(:branch_name => branch.name)
+        last   = old.first
+
+        last.close if last && last.open?
+
+        body = {:branch_name => branch.name,
+                :story_url   => story.url,
+                :iterations  => old.map(&:html_url)}
+        data = {:base  => 'master',
+                :head  => branch.commit.sha,
+                :title => story.name,
+                :body  => body}
+
+        Github::PullRequest.create data
       end
 
       desc "list", "list pull requests for the current project"
       def list
-        list_pull_requests pull_requests
+        list_pull_requests Github::PullRequest.open
       end
 
-      desc "history BRANCH_ID", "show review history for branch"
+      desc "history [BRANCH]", "show review history for branch"
       def history(branch_id = Git::Branch.current.name)
-        reqs = pull_requests(:branch_name => branch_id, :state => 'all')
+        reqs = Github::PullRequest.all(:branch_name => branch_id)
 
         list_pull_requests reqs
       end
@@ -78,60 +83,116 @@ module Flux
         Flux::PT::Project.new(pt_config['project_id'])
       end
 
-      def gh
-        Github.new :login    => gh_config['username'],
-                   :password => gh_config['password']
-      end
-
-      def gh_config
-        config['github']
-      end
-
       def pt_config
         config['pivotal_tracker']
       end
 
-      def iterations(branch_name)
-        last = pull_requests(:branch_name => branch_name).first
+      def list_pull_requests(pull_requests)
+        table =
+          [PULL_REQUEST_HEADERS] +
+          pull_requests.map { |p|
+            [p.number, Flux::PT::Story.id_from_url(p.body[:story_url]), p.author,
+             Time.parse(p.created_at).strftime("%F %R"), p.title]
+          }
+
+        puts_table table
+      end
 
-        if last
-          [last[:url]].concat(last[:body][:iterations])
-        else
-          []
+      module Github
+        def self.config
+          Flux.environment['github']
         end
-      end
 
-      def pull_requests(opts = {})
-        if opts[:state] == 'all'
-          return pull_requests(opts.merge(:state => 'open')) +
-                 pull_requests(opts.merge(:state => 'closed'))
+        def self.gh
+          ::Github.new(:login    => Github.config['username'],
+                       :password => Github.config['password'])
         end
 
-        branch_name = opts.delete(:branch_name)
+        class PullRequest
+          class << self
+            def all(opts = {})
+              pull_requests(opts.merge(:state => 'open')) +
+                pull_requests(opts.merge(:state => 'closed'))
+            end
 
-        reqs = gh.pull_requests.pull_requests(gh_config['repo_user'],
-                                              gh_config['repo_name'],
-                                              opts).each { |r|
-          r[:author]   = r[:user][:login]
-          r[:body]     = PullRequestBody.from_markdown(r[:body])
-          r[:story_id] = Flux::PT::Story.id_from_url(r[:body][:story_url])
-        }
+            def create(data)
+              pr.create_request Github.config['repo_user'],
+                                Github.config['repo_name'],
+                                PullRequest.new(data).to_hash
+            end
 
-        if branch_name
-          reqs.select { |r| r[:body][:branch_name] == branch_name }
-        else
-          reqs
-        end
-      end
+            def open(opts = {})
+              pull_requests({:state => 'open'}.merge(opts))
+            end
 
-      def list_pull_requests(pull_requests)
-        puts Hirb::Helpers::Table.render(
-          pull_requests,
-          :fields => [:number, :title, :story_id, :author, :created_at]
-        )
+            def pr
+              Github.gh.pull_requests
+            end
+
+            def update(id, data)
+              pr.update_request Github.config['repo_user'],
+                                Github.config['repo_name'],
+                                id,
+                                data.dup
+            end
+
+            private
+
+            def pull_requests(opts = {})
+              branch_name = opts.delete(:branch_name)
+
+              reqs = pr.pull_requests(Github.config['repo_user'],
+                                      Github.config['repo_name'],
+                                      opts).map { |r|
+                r[:author]   = r[:user][:login]
+                r[:body]     = ReviewBody.from_markdown(r[:body])
+
+                PullRequest.new(r)
+              }
+
+              if branch_name
+                reqs.select { |r| r.body[:branch_name] == branch_name }
+              else
+                reqs
+              end
+            end
+          end
+
+          def initialize(data)
+            @data = data
+          end
+
+          def close
+            @data[:state] = 'closed'
+
+            self.class.update number, {:state => @data[:state]}
+          end
+
+          def diff
+            auth = [Github.config['username'], Github.config['password']]
+
+            open(@data[:diff_url], :http_basic_authentication => auth).read
+          end
+
+          def method_missing(name, *args)
+            if @data.has_key?(name.to_sym)
+              @data[name.to_sym]
+            else
+              super
+            end
+          end
+
+          def open?
+            state == 'open'
+          end
+
+          def to_hash
+            @data.merge(:body => ReviewBody.to_markdown(@data[:body]))
+          end
+        end
       end
 
-      module PullRequestBody
+      module ReviewBody
         def self.from_markdown(md)
           if (md || '').include?(signoff)
             _, branch_name, story_url, iter = md.

data/lib/flux/util/table.rb

@@ -0,0 +1,99 @@
+module Flux
+  module Util
+    # Initialize a new Table.
+    #
+    # @param [Array<Array>] raw_data the table's annotated data
+    # @param field_sep the string used to separate columns
+    # @param [Integer] max_width the maximum width for this table.
+    #   Lines exceeding this width will be truncated.
+    # @param shell the shell object used by the current task
+    def puts_table(raw_data, field_sep = '  ', max_width = nil)
+      $stdout.puts Table.new(shell, raw_data, field_sep, max_width)
+    end
+
+    # A table pretty printer that allows us to take a peek at the data after
+    # it's been stripped of formatting information. It exists to make testing
+    # easier.
+    #
+    # If any cell in the first row is prefixed with '>', then that column's
+    # contents will be right-aligned. This is useful when showing numbers.
+    class Table
+      ALIGN_RIGHT = '>'
+
+      attr_reader :field_sep, :raw_data, :shell, :max_width
+
+      # @see Flux::Util#puts_table
+      def initialize(shell, raw_data, field_sep, max_width)
+        @shell     = shell
+        @raw_data  = raw_data
+        @field_sep = field_sep
+        @max_width = max_width || terminal_width
+      end
+
+      # @return whether a given column's contents will be aligned to the right
+      def align_right?(index)
+        meta[index].include?(ALIGN_RIGHT)
+      end
+
+      # @return all rows but the first
+      def body
+        @body ||= raw_data[1..-1]
+      end
+
+      # @return the table data, stripped of format information
+      def data
+        @data ||= body.unshift(headers)
+      end
+
+      # @return the table's first row
+      def headers
+        @headers = raw_data.first.each_with_index.map { |e, i|
+          align_right?(i) ? e[1..-1] : e
+        }
+      end
+
+      # @return the table's format information
+      def meta
+        @meta ||= @raw_data.first.inject([]) { |a, e|
+          a << (e =~ /^>/ ? ALIGN_RIGHT : '')
+        }
+      end
+
+      def to_s
+        @s ||=
+          begin
+            widths  = data.transpose.inject([]) { |a, col|
+              a << col.max { |a, b| a.to_s.size <=> b.to_s.size }.to_s.size
+            }
+
+            # we don't need the last column's width if it is to be left-aligned
+            widths[-1] = nil unless align_right?(-1)
+
+            format  = meta.each_with_index.inject('') { |a, (e, i)|
+              w     = widths[i] ? widths[i].to_s : ''
+              align = align_right?(i) ? '' : '-'
+
+              a << "#{field_sep}%" << align << w << 's'
+            }.strip
+
+            max_width
+
+            data.inject('') { |a, r|
+              l =
+              a << truncate(format % r, max_width) << "\n"
+            }
+          end
+      end
+
+      private
+
+      def truncate(string, width)
+        shell.send(:truncate, string, width)
+      end
+
+      def terminal_width
+        shell.send(:terminal_width)
+      end
+    end
+  end
+end

data/spec/flux/util/table_spec.rb

@@ -0,0 +1,47 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+describe Flux::Util::Table do
+  let(:body) {
+    [[123, 'unstarted', 'David Leal', 'First story'],
+     [456, 'unscheduled', '', 'Second story']]
+  }
+
+  it "is converted to a string" do
+    t = Flux::Util::Table.new(Thor::Shell::Basic.new,
+                              [%w(ID STATE ASSIGNEE STORY)] + body,
+                              '  ',
+                              nil)
+
+    t.to_s.should == <<EOT
+ID   STATE        ASSIGNEE    STORY
+123  unstarted    David Leal  First story
+456  unscheduled              Second story
+EOT
+  end
+
+  it "aligns its columns to the right" do
+    t = Flux::Util::Table.new(Thor::Shell::Basic.new,
+                              [%w(>ID >STATE >ASSIGNEE >STORY)] + body,
+                              '  ',
+                              nil)
+
+    t.to_s.should == <<EOT
+ ID        STATE    ASSIGNEE         STORY
+123    unstarted  David Leal   First story
+456  unscheduled              Second story
+EOT
+  end
+
+  it "truncates lines to a given width" do
+    t = Flux::Util::Table.new(Thor::Shell::Basic.new,
+                              [%w(ID STATE ASSIGNEE STORY)] + body,
+                              '  ',
+                              7)
+
+    t.to_s.should == <<EOT
+ID  ...
+123 ...
+456 ...
+EOT
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flux
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-17 00:00:00.000000000 Z
+date: 2012-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &76495720 !ruby/object:Gem::Requirement
+  requirement: &82116730 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.14.0
   type: :runtime
   prerelease: false
-  version_requirements: *76495720
+  version_requirements: *82116730
 - !ruby/object:Gem::Dependency
   name: pivotal-tracker
-  requirement: &76494370 !ruby/object:Gem::Requirement
+  requirement: &82116220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *76494370
+  version_requirements: *82116220
 - !ruby/object:Gem::Dependency
   name: grit
-  requirement: &76510480 !ruby/object:Gem::Requirement
+  requirement: &82115540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,21 +43,10 @@ dependencies:
         version: 2.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *76510480
-- !ruby/object:Gem::Dependency
-  name: hirb
-  requirement: &76509210 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *76509210
+  version_requirements: *82115540
 - !ruby/object:Gem::Dependency
   name: github_api
-  requirement: &76504870 !ruby/object:Gem::Requirement
+  requirement: &82114430 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *76504870
+  version_requirements: *82114430
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &76516560 !ruby/object:Gem::Requirement
+  requirement: &82111670 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +65,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *76516560
+  version_requirements: *82111670
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &76529460 !ruby/object:Gem::Requirement
+  requirement: &82109050 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +76,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *76529460
+  version_requirements: *82109050
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &76525990 !ruby/object:Gem::Requirement
+  requirement: &82123730 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +87,10 @@ dependencies:
         version: 1.6.2
   type: :development
   prerelease: false
-  version_requirements: *76525990
+  version_requirements: *82123730
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &76524520 !ruby/object:Gem::Requirement
+  requirement: &82122310 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *76524520
+  version_requirements: *82122310
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &76523420 !ruby/object:Gem::Requirement
+  requirement: &82120780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,7 +109,7 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *76523420
+  version_requirements: *82120780
 description: 
 email: david@mojotech.com
 executables:
@@ -153,7 +142,9 @@ files:
 - lib/flux/rcs/git.rb
 - lib/flux/util.rb
 - lib/flux/util/output.rb
+- lib/flux/util/table.rb
 - lib/flux/workflows/mojotech.rb
+- spec/flux/util/table_spec.rb
 - spec/flux_spec.rb
 - spec/spec_helper.rb
 - spec/support/rr.rb
@@ -172,7 +163,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 863655699
+      hash: -114953261
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: