pgit 0.0.4 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d736adc51cc2cda472f63edadcddd766f7ad22a2
-  data.tar.gz: 2b7e43a567cb947507d4d1d1cd4c0704a02af14c
+  metadata.gz: c992ab6fde90207008812368d16901885da908e4
+  data.tar.gz: edb7562be4874a0c82f28e17cdd70734bce7d195
 SHA512:
-  metadata.gz: 7c30a313b05b8940dc915c14f13c9e36621c7c876dd1b8121d23d16d0a7d2bc74d39062e1543184cb3fd5bf9f2bfdb7c39cb81184a42aa48f0a2cc4292a67a72
-  data.tar.gz: e811579cab502fd70ed1dda709637222f42036e04fd8702636da4d99319236d27876a2bc44302adf9cb6b0d66a159bf1501e5c6a12183c5eab4170fa6c3e93e1
+  metadata.gz: e467a864a8d3f2afbb1918b17c2c7715bfa3a800ea892520c9464782bb894706bd012454d09e3b8bd77a4739c370312cbc06250015ee35b29919a7c001fb615e
+  data.tar.gz: 672584afd6286457f95837d4544180d94fa291a9e743420cd34b6bee1ef2cfa8a2c43ea62d8ca2b0e49a756fced144adbeae97a278abda4117a21602bcdab930

data/.agignore

@@ -0,0 +1,3 @@
+coverage
+doc
+pkg

data/.travis.yml

@@ -3,4 +3,5 @@ rvm:
   - 2.1.2
   - 2.1.3
   - 2.1.5
+  - 2.2.0
 script: "bundle exec rake"

data/README.markdown

@@ -21,27 +21,50 @@ will create a branch for you named `implement-really-cool-feature-10102004`
 
 ## Installation
 
-* Install via RubyGems:
+### Install via RubyGems:
 
 ```
 $ gem install pgit
 ```
 
-* Setup configuration file:
-
+### Create autocompletion script and configuration file
 ```
 $ pgit install
 ```
 
-This will generate a YAML file under `~/.pgit.rc.yml`. Edit that file to add
-information about projects that you're working on.  Each project needs a
-project `id`, Pivotal Tracker `api_token`, and `path`.
+### Add a project
+
+The following will ask you questions as to which Pivotal Tracker project to associate to your working directory:
+
+```
+$ pgit proj add
+```
+
+### Create a branch
+
+Once your working directory is associated to a Pivotal Tracker project,
+this will ask you which branch to create:
+
+```
+$ pgit branch
+```
+
+### Add a command for deployment
 
-The `api_token` can be found here: https://www.pivotaltracker.com/profile
+Do you want to automate the merging/rebasing process?
+`STORY_BRANCH` is the memoized current branch.
 
-The project id is in the URL when visiting a project (i.e.
-https://pivotaltracker.com/projects/12345678)
+```
+pgit cmd add --name="finish" --steps="git fetch origin master, git rebase origin/master, git checkout master, git merge STORY_BRANCH, git branch -d STORY_BRANCH, git push origin :STORY_BRANCH, git push origin master"
+```
+
+You can run the steps of the command as follows:
+
+```
+$ pgit cmd run finish
+```
 
 
 ## Development
+
 See https://www.pivotaltracker.com/n/projects/1228944 for information.

data/Rakefile

@@ -18,3 +18,15 @@ desc 'Run specs'
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new
 task :default => [:spec]
+
+namespace :spec do
+  RSpec::Core::RakeTask.new(:unit) do |t|
+    puts 'Running unit specs'
+    t.pattern = Dir['spec/pgit/**/*_spec.rb']
+  end
+
+  RSpec::Core::RakeTask.new(:integration) do |t|
+    puts 'Running integration specs'
+    t.pattern = Dir['spec/integration/**/*_spec.rb']
+  end
+end

data/bin/pgit

@@ -10,6 +10,13 @@ version Pgit::VERSION
 subcommand_option_handling :normal
 arguments :strict
 
+desc "Color output"
+default_value :true
+switch :color
+
+desc "Print backtrace if there is an exception"
+switch :trace
+
 # desc 'Path to the config file'
 # default_value "#{ENV['HOME']}/.pgit.rc.yml"
 # arg_name '/path/to/.pivotal.yml'
@@ -21,11 +28,154 @@ arguments :strict
 # desc 'PivotalTracker API Token'
 # arg_name 'secr3tT0ken123'
 # flag [:'api-token']
+desc "Work with projects"
+command :proj do |p|
+
+  p.desc "add a project"
+  p.command :add do |a|
+
+    a.desc "the id associated to the Pivotal Tracker project"
+    a.arg_name '12030405'
+    a.flag :d, :id
+
+    a.desc "the filepath that is going to be associated to the Pivotal Tracker and Git project"
+    a.arg_name '"/some/file/path"'
+    a.default_value Dir.pwd
+    a.flag :p, :path
+
+    a.desc "your Pivotal Tracker API token"
+    a.arg_name "token"
+    a.flag :t, :api_token
+
+    a.action do |global_options,options,args|
+      app = PGit::Project::Application.new(global_options, options, args)
+      add = PGit::Project::Add.new(app)
+      add.execute!
+    end
+  end
+
+  p.desc "remove a project"
+  p.command :rm do |a|
+
+    a.desc "the path whose pgit project will be removed"
+    a.arg_name '"/some/file/path"'
+    a.default_value Dir.pwd
+    a.flag :p, :path
+
+    a.action do |global_options,options,args|
+      app = PGit::Project::Application.new(global_options, options, args)
+      rm = PGit::Project::Remove.new(app)
+      rm.execute!
+    end
+  end
+end
+
+desc "Work with custom commands defined in the current project"
+command :cmd do |c|
+  c.desc "show the custom command(s)"
+  c.arg_name 'command_name'
+  c.command :show do |s|
+    s.action do |global_options,options,args|
+      app = PGit::Command::Application.new(global_options,
+                                           options,
+                                           args)
+
+      show = PGit::Command::Show.new(app)
+      show.execute!
+    end
+  end
+
+  c.desc "run a command"
+  c.arg_name 'command_name'
+  c.command :run do |r|
+    r.action do |global_options,options,args|
+      app = PGit::Command::Application.new(global_options,
+                                           options,
+                                           args)
+      run = PGit::Command::Run.new(app)
+      run.execute!
+    end
+  end
+
+  c.desc "add a command"
+  c.command :add do |a|
+    accept(Array) do |value|
+      value.split(',').map {|item| item.strip }
+    end
+    a.desc "name of the command"
+    a.arg_name "new_command_name"
+    a.flag :n, :name, required: true
+
+    a.desc "steps of the command, delimited by commas"
+    a.arg_name "steps"
+    a.flag :s, :steps, required: true, type: Array
+
+    a.action do |global_options,options,args|
+      app = PGit::Command::Application.new(global_options,
+                                           options,
+                                           args)
+      add = PGit::Command::Add.new(app)
+      add.execute!
+    end
+  end
+
+  c.desc "edit a command"
+  c.command :edit do |a|
+    accept(Array) do |value|
+      value.split(',').map {|item| item.strip }
+    end
+    a.desc "name of the command"
+    a.arg_name "new_command_name"
+    a.flag :n, :name, required: true
+
+    a.desc "steps of the command, delimited by commas"
+    a.arg_name "steps"
+    a.flag :s, :steps, required: true, type: Array
+
+    a.action do |global_options,options,args|
+      app = PGit::Command::Application.new(global_options,
+                                           options,
+                                           args)
+      edit = PGit::Command::Edit.new(app)
+      edit.execute!
+    end
+  end
+
+  c.desc "remove a command"
+  c.command :rm do |a|
+    accept(Array) do |value|
+      value.split(',').map {|item| item.strip }
+    end
+    a.desc "name of the command"
+    a.arg_name "new_command_name"
+    a.flag :n, :name, required: true
+
+    a.action do |global_options,options,args|
+      app = PGit::Command::Application.new(global_options,
+                                           options,
+                                           args)
+      remove = PGit::Command::Remove.new(app)
+      remove.execute!
+    end
+  end
+end
+
+desc "Show the status of the story being worked on"
+command :status do |c|
+  c.action do |global_options,options,args|
+    status = PGit::Status.new(global_options,options,args)
+    status.execute!
+  end
+end
 
 desc "Installs the pgit configuration file"
 command :install do |c|
   c.action do |global_options,options,args|
-    PGit::Installer::Configuration.new(global_options, options, args)
+    completer = PGit::Installer::BashAutoCompletion.new(global_options,
+                                                        options,
+                                                        args)
+    completer.write_completer_file
+    completer.source_completer_from_bashrc
   end
 end
 
@@ -41,44 +191,34 @@ command :story_branch do |c|
   c.arg_name 'STORY_ID'
   c.flag :s, :start
 
-  # c.desc "Merge back to staging, remove local and remote (origin?) branches"
-  # c.switch :f, :finish
-
-  # c.desc "Attempts to join the story-branch that, presumably, already exists"
-  # c.arg_name 'STORY_ID'
-  # c.flag :j, :join
-
   c.action do |global_options,options,args|
     PGit::StoryBranch::Application.new(global_options, options, args)
   end
 end
 
-# desc 'Wraps `git commit -m` and prepends the message with story id of the branch'
-
-# command :commit do |c|
-  # arg_name 'Describe arguments to commit here'
-  # c.action do |global_options,options,args|
-    # puts "commit command ran"
-  # end
-# end
-
+desc 'Deal with iterations'
 
+command :branch do |c|
+  c.desc "The scope of the iteration. Valid scopes are 'current', 'current_backlog', 'backlog', and 'done'"
+  c.default_value :current_backlog
+  c.flag :s, :scope
+  c.action do |global_options,options,args|
+    bilateral_story = PGit::Bilateral::Story.new(options)
+    bilateral_story.execute!
+  end
+end
 desc 'Initializes configuration file'
-
 arg_name 'path/to/config_file'
 
-# command :init_config do |c|
-  # c.action do |global_options,options,args|
-    # puts "init_config command ran"
-  # end
-# end
-
 pre do |global,command,options,args|
   # Pre logic here
   # Return true to proceed; false to abort and not call the
   # chosen command
   # Use skips_pre before a command to skip this block
   # on that command only
+  # $trace = true if global.fetch(:trace)
+  $trace = true if global.fetch(:trace)
+  Rainbow.enabled = global.fetch(:color)
   true
 end
 
@@ -91,7 +231,9 @@ end
 on_error do |exception|
   # Error logic here
   # return false to skip default error handling
-  true
+  warn Rainbow("error: #{exception}").color(:red)
+  exception.backtrace.each { |e| warn Rainbow(e).color(:red) } if $trace
+  exit 1
 end
 
 exit run(ARGV)

data/lib/pgit.rb

@@ -1,22 +1,52 @@
 require 'json'
+require 'rainbow'
+require 'interactive'
+require 'active_model'
+require 'pgit/root.rb'
+require 'pgit/validators/project_validator'
+require 'pgit/pivotal/request'
+require 'pgit/pivotal/request/query'
+require 'pgit/pivotal/collection_request'
+require 'pgit/pivotal/individual_request'
+require 'pgit/helpers/string_extensions'
+require 'pgit/helpers/heredoc'
+require 'pgit/helpers/query_methods'
+require 'pgit/response_handler'
+require 'pgit/bilateral/handle_back'
+require 'pgit/bilateral/handle_choose_story'
+require 'pgit/bilateral/story'
 require 'pgit/error'
-require 'pgit/configuration/layout_error'
-require 'pgit/configuration/not_found_error'
-require 'pgit/configuration/project_missing_error'
-require 'pgit/configuration/missing_attributes_error'
-require 'pgit/configuration/validator'
+require 'pgit/error/user'
+require 'pgit/error/external'
 require 'pgit/configuration'
+require 'pgit/command'
+require 'pgit/command/application'
+require 'pgit/command/add'
+require 'pgit/command/edit'
+require 'pgit/command/remove'
+require 'pgit/command/run'
+require 'pgit/command/show'
 require 'pgit/current_branch'
-require 'pgit/current_project/no_paths_match_working_dir_error'
+require 'pgit/project'
+require 'pgit/project/application'
+require 'pgit/project/reuse_api_token_adder'
+require 'pgit/project/interactive_adder'
+require 'pgit/project/add'
+require 'pgit/project/remove'
+require 'pgit/pivotal/story'
+require 'pgit/pivotal/iteration'
+require 'pgit/pivotal/iterations'
+require 'pgit/pivotal/project'
+require 'pgit/pivotal/projects'
 require 'pgit/current_project/validator'
 require 'pgit/current_project'
-require 'pgit/installer/configuration'
-require 'pgit/name_parser'
+require 'pgit/installer/bash_auto_completion'
 require 'pgit/pivotal_request_validator'
-require 'pgit/external_error'
-require 'pgit/story'
 require 'pgit/story_branch'
+require 'pgit/story_branch/name_parser'
+require 'pgit/story_branch/story_id_parser'
 require 'pgit/story_branch/application'
+require 'pgit/status'
 require 'pgit/version.rb'
 require 'yaml'
 

data/lib/pgit/bilateral/handle_back.rb

@@ -0,0 +1,22 @@
+module PGit
+  module Bilateral
+    class HandleBack
+      def initialize(options)
+        @parent_question = options.fetch(:parent_question)
+        @response = options.fetch(:response)
+      end
+
+      def execute!
+        if response_can_be_handled?
+          @parent_question.reask!
+        end
+      end
+
+      private
+
+      def response_can_be_handled?
+        @response.back?
+      end
+    end
+  end
+end

data/lib/pgit/bilateral/handle_choose_story.rb

@@ -0,0 +1,31 @@
+require 'pgit'
+
+module PGit
+  module Bilateral
+    class HandleChooseStory < ResponseHandler
+      def initialize(options)
+        @response = options.fetch(:response)
+        @stories = options.fetch(:stories)
+        @response_handlers = [PGit::Bilateral::HandleBack]
+        name_parser = PGit::StoryBranch::NameParser.new(chosen_story)
+        story_branch = PGit::StoryBranch.new(name_parser)
+
+        story_branch.start
+      end
+
+      private
+
+      def chosen_story
+        @stories[@response.to_i]
+      end
+
+      def options(new_response)
+        { response: new_response, stories: @stories, parent_question: @parent_question }
+      end
+
+      def response_can_be_handled?
+        false
+      end
+    end
+  end
+end