flux 0.0.6 → 0.0.7

data/.flux.rb.sample

@@ -1,4 +1,2 @@
 use :pivotal_tracker, project_id: 128808
-use :git
 use :github, repo_user: 'mojotech', repo_name: 'flux'
-use :mojotech

data/MOJOTECH.md

@@ -0,0 +1,69 @@
+[WIP]
+
+Developer workflow
+------------------
+
+I'll start by listing scheduled (current + backlog) stories:
+
+    $ flux pt
+    ID        STATE      ASSIGNEE    EST  STORY
+    12345679  finished   David Leal    1  A developer can link a branch to a story
+    12345680  finished   David Leal    1  A developer can mark a story as started
+    12345678  unstarted                   A developer can grab a story
+    ...
+
+`12345678` is next in line, so I'll just pick that one:
+
+    $ flux feature:start 12345678 dl/grab_a_story -e 1
+
+This does a few things:
+
+* Assigns `12345678` to me.
+* Sets `1` as `12345678`'s estimate (you can't start a story unless it's estimated).
+* Marks `12345678` as `started`.
+* Creates dl/grab_a_story and origin/dl/grab_a_story.
+* Sets origin/dl/grab_a_story as dl/grab_a_story's upstream.
+
+[Time passes.]
+
+I'm done with the feature, so I'll push it and ask for a review [TODO: automate this]
+
+    $ git push
+    $ flux review:request
+
+Reviewer workflow
+-----------------
+
+Studies have found that, to properly review code, you need to look at small
+changes at a time. This allows you to reason about each change, and
+increases your chances of finding bugs. However, Github pull requests
+encourage you to look at changes as a whole. If you add a comment to a
+commit and then rewrite the branch, the comment will be wiped out from the
+pull request view.
+
+To work around this, we create a new pull request whenever we need to review
+changes to a branch.
+
+The first time we get a pull request, we just review it on Github. We add
+comments to each commit, and leave the pull request open.
+
+The branch owner sees the comments, makes the necessary changes, force-pushes
+the branch again and asks for a new review, using
+
+    $ flux review:request
+
+This will close the old pull request and open a new one.
+
+The reviewer can check if a new branch was changed using
+
+    $ flux review:history <branch name>
+    NUM     STORY  AUTHOR  DATE              TITLE
+     34  19692783  david   2012-02-21 15:15  A developer can only submit for...
+     33  19692783  david   2012-02-21 13:02  A developer can only submit for...
+
+The reviewer can also see what exactly changed between the 2 branches using
+
+    $ flux review:diff
+    ...
+
+Without arguments, this will show an interdiff between the last 2 revisions.

data/README.md

@@ -1,108 +1,42 @@
 Flux
 ====
 
-Flux is a command-line tool that tries to eliminate the drudgery from your
+Flux is a command-line tool we use at MojoTech to automate some parts of our
 workflow.
 
 It provides hooks for interacting with the following:
 
-* Tracker (currently only Pivotal Tracker is supported)
-* RCS (currently, git only)
-* Anything else you can think of, as long as someone implements it.
-
-Some examples
--------------
-
-Let's list all stories that have been scheduled (i.e., moved out of the icebox
-and into some iteration):
-
-    $ flux stories
-    ID        STATE      ASSIGNEE    STORY
-    12345678  unstarted              A developer can grab a story
-    12345679  finished   David Leal  A developer can link a branch to a story
-    12345680  finished   David Leal  A developer can mark a story as started
-    ...
-
-[TODO Complete workflow. For now try `flux` to see a list of implemented tasks.]
+* Pivotal Tracker
+* Git
+* Github pull requests
 
 Configuration
 -------------
 
-A project is configured by placing a file named `.flux` in the project root.
-Each top level key represents a functional domain.
+A project is configured by placing a file named `.flux.rb` in the project root.
 
 This project's `.flux` file is as follows:
 
-    trackers:
-      adapter: pivotal_tracker
-      project_id: 128808
-    rcs:
-      adapter: git
-    workflows:
-      adapter: mojotech
+    use :pivotal_tracker, project_id: 128808
+    use :github, repo_user: 'mojotech', repo_name: 'flux'
 
 ### Local configuration
 
-The `.flux` file should be used for project-wide configuration and kept under
+The `.flux.rb` file should be used for project-wide configuration and kept under
 version control. Obviously you aren't going to store your account credentials
 there, so you need a different place where you can store them. That place is
-`.flux.local`. If you're using Git (and really, why wouldn't you?), this file
- should be added to the project's `.gitignore`.
-
-Here's an example of a `.flux.local` file.
-
-    trackers:
-      token: abcdef1234567890
-      email: david@mojotech.com
-
-Note for Pivotal Tracker: Your API token is at https://www.pivotaltracker.com/profile
-
-
-Code Reviews Workflow
----------------------
-
-# start your feature on a branch
-$ git checkout feature-branch
-
-# code your feature
-$ git commit # rinse, repeat
-
-# make sure your code to review is available
-$ git push
-
-# request a review
-$ flux branches:review feature-branch [ --parent master ]
-# Note: currently, you must explicitly list your feature branch name
-# This feature branch name will be used to keep track of multiple rounds
-# of the review.
-
-# flux will generate a pull request and print its URL
-
-# Github takes sends out notices.
-# other devs review and comment
-
-# You fix up your commits.
-$ git rebase -i origin/master
-# I'm in your branch... rewriting your history.
-
-# Time to resubmit for review
-$ git push
-$ flux request-review feature-branch [ --parent master ] [ --close ]
-
-# flux closes old review request for feature-branch (optionally)
-# flux opens a new review request for feature-branch
-# The process repeats.
-
-# Now the reviewers want to see if you addressed their concerns.
-# They run:
-$ flux branches:all_reviews
-# (TODO: should be able to limit this report to one feature branch)
+`.flux.local.rb`. This file should be added to the project's `.gitignore`.
 
-# They see: the most recent review request for each branch, but also links
-# to the diffs between each previous review request for that branch.
+Here's an example of a `.flux.local.rb` file.
 
-# So, instead of repeating the entire review, they can look at just the "inter-diff"
+    use :pivotal_tracker, token: 'abcdef1234567890', email: 'david@mojotech.com'
+    use :github, username: 'david', password: 'IL0vePandas!'
 
+Your Pivotal Tracker API token is at https://www.pivotaltracker.com/profile
 
+Use
+---
 
+    $ flux # show a list of available tasks
 
+For a complete description of our workflow, see MOJOTECH.md.

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.0.7

data/flux.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "flux"
-  s.version = "0.0.6"
+  s.version = "0.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Leal"]
-  s.date = "2012-02-18"
+  s.date = "2012-02-22"
   s.email = "david@mojotech.com"
   s.executables = ["flux"]
   s.extra_rdoc_files = [
@@ -23,6 +23,7 @@ Gem::Specification.new do |s|
     ".rspec",
     "Gemfile",
     "LICENSE.txt",
+    "MOJOTECH.md",
     "README.md",
     "Rakefile",
     "VERSION",
@@ -31,17 +32,16 @@ Gem::Specification.new do |s|
     "lib/flux.rb",
     "lib/flux/cli.rb",
     "lib/flux/cli/feature.rb",
+    "lib/flux/cli/git.rb",
     "lib/flux/cli/pivotal_tracker.rb",
     "lib/flux/cli/review.rb",
     "lib/flux/ext/pivotal-tracker.rb",
     "lib/flux/git.rb",
     "lib/flux/pivotal_tracker.rb",
-    "lib/flux/rcs.rb",
-    "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/git_spec.rb",
     "spec/flux/util/table_spec.rb",
     "spec/flux_spec.rb",
     "spec/spec_helper.rb",

data/lib/flux.rb

@@ -1,7 +1,7 @@
 require 'ostruct'
 require 'pathname'
 require 'thor'
-require 'yaml'
+require 'forwardable'
 
 require 'flux/util'
 
@@ -22,7 +22,6 @@ module Flux
       load rc
       load rc_local if File.exist?(rc_local)
 
-      require 'flux/rcs'
       require 'flux/cli'
     end
 

data/lib/flux/cli.rb

@@ -1,3 +1,4 @@
 require 'flux/cli/feature'
 require 'flux/cli/pivotal_tracker'
 require 'flux/cli/review'
+require 'flux/cli/git'

data/lib/flux/cli/feature.rb

@@ -3,6 +3,8 @@ require 'flux/git'
 module Flux
   module CLI
     class Feature < Thor
+      B = Flux::Git::Branch
+
       namespace :feature
 
       desc "start STORY_ID BRANCH", "start working on a story"
@@ -10,29 +12,42 @@ module Flux
       method_option :parent_branch, :type    => :string,
                                     :default => 'master',
                                     :aliases => '-b'
-      def start(story_id, branch_id)
+      def start(story_id, branch_id = branch_id_from_story(story_id))
         invoke 'pt:grab', [story_id], :estimate => options[:estimate]
         invoke 'pt:start', [story_id]
+        invoke 'branch:create',
+               [branch_id],
+               :parent_branch => options[:parent_branch]
 
-        create_branch branch_id, story_id, options
+        link story_id, branch_id
       end
 
-      private
-
-      def create_branch(branch_id, story_id, options = {})
-        up     = Git::Branch.remote('origin', branch_id)
-        parent = Git::Branch.local(options[:parent_branch])
-        branch = Git::Branch.local(branch_id).
-          create(parent).
-          publish(up).
-          track(up).
-          checkout
+      desc "link STORY_ID BRANCH", "link a story to a branch"
+      def link(story_id, branch_id)
+        B.local(branch_id).config('story_id', story_id)
+      end
 
-        link_branch_to_story branch_id, story_id
+      desc "finish", "finish the current feature"
+      def finish(branch_id = B.current.name)
+        invoke "pt:finish", [B.local(branch_id).config('story_id')]
+        invoke "review:request"
       end
 
-      def link_branch_to_story(branch_id, story_id)
-        Git::Branch.local(branch_id).config('story_id', story_id)
+      private
+
+      def branch_id_from_story(story_id)
+        project  = Flux::PT::Project.current
+        story    = project.stories.find(story_id)
+        words    = story.
+          name.
+          strip.
+          downcase.
+          split(/\s+/).
+          select { |w| w.size > 2 }.
+          last(7)
+        initials = project.members.me.initials.downcase
+
+        "#{initials}/#{story.id}-#{words.join('_')}"
       end
     end
   end

data/lib/flux/cli/git.rb

@@ -0,0 +1,66 @@
+require 'flux/git'
+
+module Flux
+  module CLI
+    class Git < Thor
+      G = Flux::Git
+
+      namespace :git
+
+      desc "fetch", "fetch changes from remote repos"
+      def fetch
+        G.git.fetch
+      end
+    end
+
+    class Branch < Thor
+      B = Flux::Git::Branch
+
+      namespace :branch
+
+      desc "create BRANCH", "create a branch as a public, tracked branch"
+      method_option :parent_branch, :type    => :string,
+                                    :default => 'master',
+                                    :aliases => '-p'
+      def create(branch_id, options = {})
+        up     = B.remote(branch_id, 'origin')
+        parent = B.local(options[:parent_branch])
+        branch = B.local(branch_id).
+          create(parent).
+          publish(up).
+          track(up).
+          checkout
+      end
+
+      class Checks < Thor
+        G = Flux::Git
+        B = G::Branch
+
+        namespace 'branch:checks'
+
+        desc "synced [BRANCH]", "check if branch is synced with upstream"
+        def synced(branch = B.current)
+          branch = G::Branch(branch)
+
+          unless branch.synced?
+            raise Error, "Local branch `#{branch.name}' is not synced."
+          end
+        end
+
+        desc "rebased [BRANCH]", "check if branch is rebased with other branch"
+        method_option :parent, :type    => :string,
+                               :default => 'master',
+                               :aliases => '-p'
+        def rebased(branch = B.current)
+          branch = G::Branch(branch)
+          parent = G::Branch(options[:parent])
+
+          unless branch.includes?(parent)
+            raise Error,
+                  "`#{branch.fqdn}' is not rebased onto `#{parent.fqdn}'."
+          end
+        end
+      end
+    end
+  end
+end

data/lib/flux/cli/pivotal_tracker.rb

@@ -1,9 +1,6 @@
 require 'pivotal-tracker'
-require 'hirb'
 require 'flux/pivotal_tracker'
 require 'flux/ext/pivotal-tracker'
-require 'flux/util/table'
-require 'forwardable'
 
 module Flux
   module CLI
@@ -18,12 +15,8 @@ module Flux
       default_task :list
 
       class << self
-        def config
-          Flux.environment['pivotal_tracker']
-        end
-
         def login
-          ::PivotalTracker::Client.token = config['token']
+          ::PivotalTracker::Client.token = Flux::PT.config['token']
         end
 
         def story_update(name, attrs = nil, &get_attrs)
@@ -43,7 +36,7 @@ module Flux
         def_delegator self, :config
       }
 
-      login if config
+      login if Flux::PT.config
 
       desc "list", "list stories, excluding icebox by default"
       def list
@@ -57,17 +50,13 @@ module Flux
       end
 
       story_update :finish, :current_state => 'finished'
-      story_update(:grab)   {{:owned_by => me.name}}
+      story_update(:grab)   {{:owned_by => current_project.members.me.name}}
       story_update :start,  :current_state => 'started'
 
       private
 
       def current_project
-        Flux::PT::Project.new(config['project_id'])
-      end
-
-      def me
-        current_project.members.find { |m| m.email == config['email'] }
+        Flux::PT::Project.current
       end
 
       def story(id)

data/lib/flux/cli/review.rb

@@ -5,6 +5,9 @@ require 'github_api'
 module Flux
   module CLI
     class Review < Thor
+      G = Flux::Git
+      B = G::Branch
+
       PULL_REQUEST_HEADERS = %w(>NUM >STORY AUTHOR DATE TITLE)
 
       include Flux::Util
@@ -15,7 +18,7 @@ module Flux
       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)
+      def diff(branch_name = B.current.name)
         reqs = Github::PullRequest.all(:branch_name => branch_name)
 
         if options[:from] && options[:to]
@@ -41,10 +44,16 @@ module Flux
         end
       end
 
-      desc "request", "request a review for the current feature"
-      def request
-        branch = Git::Branch.current
-        story  = current_project.stories.find(branch.config('story_id'))
+      desc "request [BRANCH]", "request a review"
+      def request(branch = B.current)
+        branch = G::Branch(branch)
+
+        invoke 'git:fetch'
+        invoke 'branch:checks:synced', [branch]
+        invoke 'branch:checks:rebased', [branch], :parent => 'origin/master'
+
+        story  = Flux::PT::Project.
+          current.stories.find(branch.config('story_id'))
         old    = Github::PullRequest.all(:branch_name => branch.name)
         last   = old.first
 
@@ -54,7 +63,7 @@ module Flux
                 :story_url   => story.url,
                 :iterations  => old.map(&:html_url)}
         data = {:base  => 'master',
-                :head  => branch.commit.sha,
+                :head  => branch.top.sha,
                 :title => story.name,
                 :body  => body}
 
@@ -67,7 +76,7 @@ module Flux
       end
 
       desc "history [BRANCH]", "show review history for branch"
-      def history(branch_id = Git::Branch.current.name)
+      def history(branch_id = B.current.name)
         reqs = Github::PullRequest.all(:branch_name => branch_id)
 
         list_pull_requests reqs
@@ -79,14 +88,6 @@ module Flux
         Flux.environment
       end
 
-      def current_project
-        Flux::PT::Project.new(pt_config['project_id'])
-      end
-
-      def pt_config
-        config['pivotal_tracker']
-      end
-
       def list_pull_requests(pull_requests)
         table =
           [PULL_REQUEST_HEADERS] +

data/lib/flux/git.rb

@@ -1,4 +1,4 @@
-require 'forwardable'
+require 'grit'
 
 module Flux
   module Git
@@ -15,14 +15,31 @@ module Flux
         raise RCSError, "Couldn't find git repo starting at #{start_dir}."
     end
 
-    class Branch
-      extend Forwardable
+    def self.Branch(branch, repo_path = Git.repo_path)
+      case branch
+      when Branch
+        branch
+      when String
+        remotes = Git.repo(repo_path).remote_list
 
+        if remotes.find { |r| branch =~ %r{^#{r}/} }
+          args = branch.split('/', 2).reverse << repo_path
+
+          Branch.remote(*args)
+        else
+          Branch.local(branch, repo_path)
+        end
+      else
+        raise "Unable to convert object to branch: #{branch.inspect}"
+      end
+    end
+
+    class Branch < Struct.new(:repo_path, :remote, :name)
       def self.current(repo_path = Git.repo_path)
         Branch.local(Git.repo(repo_path).head.name, repo_path)
       end
 
-      def self.remote(remote, name, repo_path = Git.repo_path)
+      def self.remote(name, remote = 'origin', repo_path = Git.repo_path)
         new(repo_path, remote, name)
       end
 
@@ -30,15 +47,11 @@ module Flux
         new(repo_path, nil, name)
       end
 
-      def_delegator :head, :commit
-
-      attr_reader :name, :remote
-
       def initialize(repo_path, remote, name)
-        @git    = Git.git(repo_path)
-        @remote = remote
-        @name   = name
-        @repo   = Git.repo(repo_path)
+        super
+
+        @git  = Git.git(repo_path)
+        @repo = Git.repo(repo_path)
       end
 
       def config(var, value = nil)
@@ -60,7 +73,17 @@ module Flux
       end
 
       def fqdn
-        "#{remote}/#{name}"
+        remote ? "#{remote}/#{name}" : name
+      end
+
+      def include?(branch)
+        @repo.commits_between(fqdn, branch.fqdn).empty?
+      end
+
+      alias_method :includes?, :include?
+
+      def top
+        @repo.commits(fqdn, 1).first
       end
 
       def publish(upstream)
@@ -73,9 +96,16 @@ module Flux
         tap { @git.branch({:set_upstream => true}, @name, upstream.fqdn) }
       end
 
-      private
+      def synced?
+        upstream.top.sha == top.sha
+      end
+
+      def upstream
+        remote = config('remote')
+        name   = config('merge').sub('refs/heads/', '')
 
-      def_delegator :@repo, :head
+        Branch.remote(name, remote, repo_path)
+      end
     end
   end
 end

data/lib/flux/pivotal_tracker.rb

@@ -1,14 +1,28 @@
 module Flux
   module PT
+    def self.config
+      Flux.environment['pivotal_tracker']
+    end
+
     class Project
       attr_reader :id
 
+      def self.current
+        Project.new(PT.config['project_id'])
+      end
+
       def initialize(id)
         @id = id
       end
 
       def members
-        ::PivotalTracker::Membership.all(self)
+        ::PivotalTracker::Membership.all(self).tap { |members|
+          class << members
+            def me
+              find { |m| m.email == PT.config['email'] }
+            end
+          end
+        }
       end
 
       def stories

data/lib/flux/util.rb

@@ -1,2 +1,2 @@
 require 'flux/util/output'
-
+require 'flux/util/table'

data/spec/flux/git_spec.rb

@@ -0,0 +1,51 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+require 'flux/git'
+
+describe "Flux::Git::Branch()" do
+  G = Flux::Git
+  B = G::Branch
+
+  it "when passed a branch, returns the same branch" do
+    G::Branch(B.current).should == B.current
+  end
+
+  it "converts a remote/branch/name string to a remote branch" do
+    stub(G).repo('blah').stub!.remote_list { ['origin'] }
+
+    a = B.remote('dl/something', 'origin', 'blah')
+    b = G::Branch('origin/dl/something', 'blah')
+
+    b.should == a
+  end
+
+  it "converts a branch/name string to a local branch" do
+    stub(G).repo('blah').stub!.remote_list { ['origin'] }
+
+    a = B.local('dl/something', 'blah')
+    b = G::Branch('dl/something', 'blah')
+
+    b.should == a
+  end
+end
+
+describe Flux::Git::Branch do
+  self::G = Flux::Git
+  self::B = G::Branch
+
+  it "determines whether it is rebased with another branch" do
+    stub(G).repo('.').stub! {
+      commits_between('my_branch', 'master') { [] }
+      commits_between('my_branch', 'origin/my_branch') {
+        ["commit_in_origin_my_branch"]
+      }
+    }
+
+    a = B.local('my_branch', '.')
+    b = B.remote('my_branch', 'origin', '.')
+    c = B.local('master', '.')
+
+    a.should include(c)
+    a.should_not include(b)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flux
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-18 00:00:00.000000000 Z
+date: 2012-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &82116730 !ruby/object:Gem::Requirement
+  requirement: &86582250 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.14.0
   type: :runtime
   prerelease: false
-  version_requirements: *82116730
+  version_requirements: *86582250
 - !ruby/object:Gem::Dependency
   name: pivotal-tracker
-  requirement: &82116220 !ruby/object:Gem::Requirement
+  requirement: &86581640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *82116220
+  version_requirements: *86581640
 - !ruby/object:Gem::Dependency
   name: grit
-  requirement: &82115540 !ruby/object:Gem::Requirement
+  requirement: &86581140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *82115540
+  version_requirements: *86581140
 - !ruby/object:Gem::Dependency
   name: github_api
-  requirement: &82114430 !ruby/object:Gem::Requirement
+  requirement: &86580730 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *82114430
+  version_requirements: *86580730
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &82111670 !ruby/object:Gem::Requirement
+  requirement: &86580390 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *82111670
+  version_requirements: *86580390
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &82109050 !ruby/object:Gem::Requirement
+  requirement: &86579740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *82109050
+  version_requirements: *86579740
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &82123730 !ruby/object:Gem::Requirement
+  requirement: &86577840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 1.6.2
   type: :development
   prerelease: false
-  version_requirements: *82123730
+  version_requirements: *86577840
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &82122310 !ruby/object:Gem::Requirement
+  requirement: &86577180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *82122310
+  version_requirements: *86577180
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &82120780 !ruby/object:Gem::Requirement
+  requirement: &86602150 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,7 +109,7 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *82120780
+  version_requirements: *86602150
 description: 
 email: david@mojotech.com
 executables:
@@ -125,6 +125,7 @@ files:
 - .rspec
 - Gemfile
 - LICENSE.txt
+- MOJOTECH.md
 - README.md
 - Rakefile
 - VERSION
@@ -133,17 +134,16 @@ files:
 - lib/flux.rb
 - lib/flux/cli.rb
 - lib/flux/cli/feature.rb
+- lib/flux/cli/git.rb
 - lib/flux/cli/pivotal_tracker.rb
 - lib/flux/cli/review.rb
 - lib/flux/ext/pivotal-tracker.rb
 - lib/flux/git.rb
 - lib/flux/pivotal_tracker.rb
-- lib/flux/rcs.rb
-- 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/git_spec.rb
 - spec/flux/util/table_spec.rb
 - spec/flux_spec.rb
 - spec/spec_helper.rb
@@ -163,7 +163,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -114953261
+      hash: -283853007
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/flux/rcs.rb

@@ -1 +0,0 @@
-require 'flux/rcs/git'

data/lib/flux/rcs/git.rb

@@ -1,162 +0,0 @@
-require 'grit'
-require 'json'
-
-module Flux
-  module RCS
-    class Branches < Thor
-      namespace :branches
-
-      desc "review BRANCH_NAME", "review a branch"
-      method_option :parent, :type => :string, :default => "master", :desc => "upstream"
-      method_option :close, :type => :boolean, :default => false, :desc => "whether or not to close previous review requests for this branch", :aliases => '-c'
-      def review(branch_name=nil)
-        # note: we ignore any closed review requests for this branch
-        # so, if there are no open review requests, this one will start out at version 1.
-        related = open_reviews_for(branch_name)
-
-        if branch_name
-          # we use the sha instead of the branch name in order to prevent GH from
-          # updating the pull-request when someone pushed to the branch again.
-          head = repo.get_head(branch_name).commit.sha
-        else
-          head = repo.head.commit.sha
-        end
-
-        if related.last
-          previous_title = related.last["title"]
-          previous_version = previous_title.match(/Please review .+ \(v(\d+)\)/)[1].to_i
-          new_version = previous_version + 1
-        else
-          new_version = 1
-        end
-        history = related.map {|pr| pr["title"] }.join("\n")
-        history = "PRIOR VERSIONS: \n" + history unless history.empty?
-        data = {
-          :title => "Please review #{branch_name} (v#{new_version}) (#{head[0..8]})",
-          :head => head,
-          :base => options[:parent],
-          :body => history
-        }.to_json
-        cmd = "curl -s #{auth_string} #{pulls_url} -d '#{data}'"
-
-        puts cmd if @debug
-        new_pr = JSON.parse(`#{cmd}`)
-        if new_pr["number"].to_i > 0
-          puts "Created a new review request: #{new_pr["html_url"]}"
-        else
-          puts "Error: "
-          puts new_pr
-          return
-        end
-
-        if options.close?
-          # close previous pull requests
-          related.each {|pr| close_pull_request(pr) }
-        end
-        new_pr
-      end
-
-      desc "all_reviews", "list all pending reviews"
-      def all_reviews
-        reviews("open").group_by {|pr|
-          pr["title"].match(/Please review (.+) \(v.+\)/)[1]
-        }.each_pair {|branch_name, prs|
-          puts "\nReviews for #{branch_name}:"
-          prior_head = nil
-          pr = nil
-          our_reviews = reviews_for(branch_name)
-          our_reviews.each {|pr|
-            head = pr["title"].match(/Please review .+ \(v.+\) \((.+)\)/)[1]
-            title = pr["title"].sub("Please review #{branch_name}", "")
-            line = "  #{title} : #{pulls_url}/#{pr["number"]}"
-            if prior_head
-              line << " : #{compare_cmd(prior_head, head)}"
-            end
-            puts line
-            prior_head = head
-          }
-          puts "  Latest review request: #{our_reviews.last["html_url"]}"
-        }
-      end
-
-      private
-
-      def compare_cmd(prior_head, head)
-        "git diff #{prior_head}..#{head}"
-      end
-
-      def reviews(state = "open")
-        @cached ||= {}
-        return @cached[state] if @cached[state]
-        cmd = "curl -s #{auth_string} #{pulls_url}?state=#{state}"
-        puts cmd if @debug
-        pull_requests = JSON.parse(`#{cmd}`)
-        @cached[state] = pull_requests.select {|pr|
-          pr["title"] =~ /Please review .+ \(v.+\)/
-        }
-      end
-
-      def filter_for_branch(pull_requests, branch_name)
-        pull_requests.select {|pr|
-          pr["title"] =~ /Please review #{branch_name} \(v.+\)/
-        }.sort_by {|pr| pr["title"] }
-      end
-
-      def open_reviews_for(branch_name)
-        filter_for_branch(reviews("open"), branch_name)
-      end
-
-      def closed_reviews_for(branch_name)
-        filter_for_branch(reviews("closed"), branch_name)
-      end
-
-      def reviews_for(branch_name)
-        filter_for_branch(reviews("closed"), branch_name) + filter_for_branch(reviews("open"), branch_name)
-      end
-
-      def close_pull_request(pr)
-        puts "closing review request: #{pr["title"]}"
-        data = {
-          "state" => "closed",
-          "body" => "This review request has been replaced by: \n" + pr["body"]
-        }.to_json
-        cmd = "curl -s -X PATCH #{auth_string} #{pulls_url}/#{pr["number"]} -d '#{data}'"
-        puts cmd if @debug
-        `#{cmd}`
-      end
-
-      def api_host
-        "https://api.github.com"
-      end
-
-      def pulls_url
-        repo_user = config['repo_user']
-        repo_name = config['repo_name']
-        "#{api_host}/repos/#{repo_user}/#{repo_name}/pulls"
-      end
-
-      def auth_string
-        username = config['username']
-        password = config['password']
-        "-u \"#{username}:#{password}\""
-      end
-
-      def config
-        Flux.environment['github']
-      end
-
-      def git
-        @git ||= Grit::Git.new(repo_path)
-      end
-
-      def repo
-        @repo ||= Grit::Repo.new(repo_path)
-      end
-
-      def repo_path
-        Flux.find_upwards('.git', Dir.pwd) or
-          raise RCSError, "Couldn't find git repo starting at #{Dir.pwd}."
-      end
-    end
-  end
-end

data/lib/flux/workflows/mojotech.rb

@@ -1,40 +0,0 @@
-require 'flux/git'
-
-module Flux
-  module Workflows
-    module MojoTech
-      class Feature < Thor
-        namespace :feature
-
-        desc "start STORY_ID BRANCH_ID", "start working on a story"
-        method_option :estimate,      :type    => :numeric
-        method_option :parent_branch, :type    => :string,
-                                      :default => 'master',
-                                      :aliases => '-b'
-        def start(story_id, branch_id)
-          invoke 'stories:grab', [story_id], :estimate => options[:estimate]
-          invoke 'stories:start', [story_id]
-
-          create_branch branch_id, options
-        end
-
-        private
-
-        def create_branch(branch_id, options = {})
-          up     = Branch.remote(repo_path, 'origin', branch_id)
-          parent = Branch.local(repo_path, options[:parent_branch])
-          branch = Branch.local(repo_path, branch_id).
-            create(parent).
-            publish(up).
-            track(up).
-            checkout
-        end
-
-        def repo_path
-          Flux.find_upwards('.git', Dir.pwd) or
-            raise RCSError, "Couldn't find git repo starting at #{Dir.pwd}."
-        end
-      end
-    end
-  end
-end