rgitflow 0.2.1.pre.alpha.pre.28 → 0.2.1.pre.alpha.pre.32

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjkwNWNhODE3YjFkZDlhZTQ1OGZjMTcyZGE3MTMyOWNmNzk5YWE2Mg==
+    ZTJkOGFiZjVhNmM1ODE4ZWYxNzY1MjkxYTM3ZTM1NWQ2YmExZjhiNQ==
   data.tar.gz: !binary |-
-    NmJjMmQ2NWYwYTE1OWYwMzQ3MmIwMGMzZTg0MzNjNGJkYjAzNTEyNA==
+    NDc3NjQxYzJjNDAyYjg3MjBmYjdmNGJlNzAzZmQzMDUyMGRkOGM2MQ==
 SHA512:
   metadata.gz: !binary |-
-    N2ZlMDc2NjAzYzhmOWZjMjY4YTI5OTViOTM1ZmNhMjhlMzZkNjk4Y2U0Mjcw
-    N2MyYTFkNzk2MjQxMDg5NWE5YWYyMzE4N2VmZmNhOGI5NzdlY2FlYTExOTli
-    MjY2NTUzOTFlMjE3NmMwODAzYzkyOGE0MDhjMDZkMWYwMGZlN2E=
+    NzNmNzlmODFjNTFhOGQ3OTNmOGZlZjUyNDg0NWM2ODEwNTc2NzRiNjFhMzVl
+    ZjY2ZDg4ZWRhY2M3ZTcyYTc5ZDk0OTJkZDNiYWM5ZDBlZjNmNjZkZDE5Yzlj
+    ODA2ZmJiMDAwYjVmZjU0MWRmZTA0ZWQyZDE0ZmU2ZDYzNWIxYmQ=
   data.tar.gz: !binary |-
-    NjQyYmI5MTNlY2I5Nzg4MDAyOTVmY2E4OGM2ZmI5Y2YxOTFkNDBjY2M4Y2E2
-    NDMwM2QzY2VjZTc4YWY0NTgwYTYxNWNlYTc2NjY4OGEzZDNkNzIzNTEyMGZk
-    NTY5MzcwNDk4Yjg3MTBmMmNhYjQ2NmJiOTRhY2NmYTVkNDdlNDk=
+    MzM2OTY4OGZlN2MzMTE1NWJmNDY3ZmNhNDUwODhiM2E3ZjE2ZGU1ZGM5NGVj
+    ZDMwMzI2MmNmMWNiNzRjYWZkNzIyNzE1Mjc4N2FhZGZlMmVjYjA2NTJmOGI2
+    ZDMwNjZjNGI5MDI5NjU4NDA2MzY0NWI1NTkxNzQ3YzQzYmM4YTA=

data/.travis.yml

@@ -8,8 +8,8 @@ addons:
 deploy:
   provider: rubygems
   api_key:
-    secure: nQUUd0plPSX2osSS7Z4Y+XefgF7n01jvwTJDcou97RRG4cyUUYo0rkXRHf7pZx8VTPQP+W+pM9HSP4lHFdcaTGWvP4BPRDc2VFEfu0o9eSse6RKoruqlRc1Wc5vAZVskR3lrOm6/zvYjFoPmruTSU3Zeoey54I+VERbThc7foQhCCKVbpoqRQ/XrpCwu5P9bf9yjIuC/f+z0jRZc51xG1e48M2s3Td3zvb4h8f7577CoUe3C+llQywGid7JvwF9XMXc2wdcV/Qr+Y4nsZ6I2LA/cZ/m2C9Z05MSc3/K6dtLJzzeCQoydA4NCgoTsBzNPwMS6KiokLEPpo6ufBY+CsgsyUJWf3rtRRYyJFxwHCBZaAMh00rLxbt5GXx3GvzVH7I6p1wlmFkfd19w5LUJGa1K9g6bMChC9VzWlXknfbk1958h/lex+KJ+SA2qJdDhHh3A4SIdJkdo71F4PSxTHbA4hCaOPxDDZcd02TUJGJUcS/BaNskoydSRYNDQ2WWGpPPp+KoMwIrIyft1A5zmK/JDTvR8kxDgtUPxXslGvVyJG/PrkmsmUobwiDXZuZv/vcW+YpxYS91rUQJJvMjTypNbe45Upgbx4miI1QyI2O0xtvNnH3C0AU1iN/35F6yrIzz37uUvYGZyRssadR3mim1V+sN/D6V1vWlZMJSI6e7E=
+    secure: HE1zrfb02kTtlyfM8XWwwOEcY6JXN6YtcwPVuEimzwOHUBmaqyxSZDjnY2PbqjZpyHkmhr0dqcdhm0InFMPaF4s2Alew+e5B4CCMhRieg04cz150/Vt8FRX+uqiJz+SpDiNUcCJcBK61SjVl60b0DehvBP5P/q9bh8DOR2cOBym+MU2SymySp3XCnVvyOPjpp6GV8AqOT3+pAFqSrClmQuNo8v/ikoqogPzrEKrA3XN0x8qLbD3PKbOjEwMgktupTeDqFPWrsH9lawWi3eQn0unWXhzRt51gNxKMLK0xnO3EMSyILVmaT/h5DnMC6UxtWdf5y+MxVU0skR3TgCn4CpoLbd2LJSV+6JYBLO9YfIPHbtQ/aq/VmflGE/oovavthJxEyuCnGeRr7We9B109NsWE4yMTYR/S4U51X4ssNOIoJLkJK2T6ucVGgx30K79u8Zylg5WW3e4sNEgm6cRv9496e1byQYkZ9qQRrqmH1eR8Wnvyrf0cneWJYKcOtknrEZxpcs3X69fca4oL7M2WJeXPVWKyg9oBcPajkQuiiCRo9IR9CkwthIK2GNFkcW8Yn418KR7m381YrFhG7E7ifO8HsX1a/RpzjGYxXm1jxgnU3+4T615EEiKQtzTfBn154QpG7YGXYNTB7cii9EXOzHZA9Hu4g+iuylkXAvveqWQ=
   gem: rgitflow
   on:
-    all_branches: true
+    tags: true
     repo: Nunnery/rgitflow

data/README.md

@@ -29,12 +29,19 @@ TODO: Write usage instructions here
 
 ## Development
 
-TODO: Write development instructions here
+After checking out the repo, run `bin/setup` to install dependencies and
+regenerate the binstubs as necessary.
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/Nunnery/rgitflow. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on [GitHub].
+This project is intended to be a safe, welcoming space for collaboration, and
+ contributors are expected to adhere to the [Code of Conduct].
 
 ## License
 
-The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
+The gem is available as open source under the terms of the [MIT License].
+
+[GitHub]: https://github.com/Nunnery/rgitflow
+[Code of Conduct]: http://contributor-covenant.org
+[MIT License]: http://opensource.org/licenses/MIT

data/Rakefile

@@ -26,6 +26,13 @@ RSpec::Core::RakeTask.new
 task :test    => [:spec]
 task :default => [:spec]
 
+desc 'Removes the tmp and pkg directories'
+task :clean do
+  pwd = Dir.pwd.to_s
+  FileUtils.rm_rf Dir["#{pwd}/tmp"]
+  FileUtils.rm_rf Dir["#{pwd}/pkg"]
+end
+
 require 'yard'
 YARD::Rake::YardocTask.new
 task :doc => [:yard]

data/bin/setup

@@ -2,4 +2,5 @@
 set -euo pipefail
 IFS=$'\n\t'
 
-bundle install
+bundle install
+gem regenerate_binstubs

data/exe/rgitflow

@@ -1,68 +1,76 @@
 #!/usr/bin/env ruby
-require 'thor'
 require 'rgitflow'
+require 'rgitflow/cli'
+require 'rubygems'
+require 'commander/import'
 
-module RGitFlowCLI
-  class Feature < Thor
-    include ::RGitFlow::Console
+program :version, RGitFlow::VERSION.to_s
+program :description, 'Executable wrapper for RGitFlow rake tasks.'
 
-    desc 'start <name>', 'starts a feature branch named <name>'
-    def start(name)
-      run 'bundle', 'exec', 'rake', 'rgitflow:feature:start', "BRANCH=#{name}"
-    end
-
-    desc 'finish', 'finishes a feature branch'
-    def finish(name)
-      run 'bundle', 'exec', 'rake', 'rgitflow:feature:finish', "BRANCH=#{name}"
-    end
+command :'release start' do |c|
+  c.syntax      = 'rgitflow release start'
+  c.description = 'Starts a release branch'
+  c.action do |args, options|
+    RGitFlow::CLI.commandline ['bundle', 'exec', 'rake',
+                               'rgitflow:release:start'].join(' ')
   end
+end
 
-  class Release < Thor
-    include ::RGitFlow::Console
-
-    desc 'start', %Q(starts a release branch named
-                    #{RGitFlow::Config.options[:release]}/#{RGitFlow::VERSION.to_s})
-    def start(name)
-      run 'bundle', 'exec', 'rake', 'rgitflow:release:start', "BRANCH=#{name}"
-    end
-
-    desc 'finish', 'finishes a release branch'
-    def finish(name)
-      run 'bundle', 'exec', 'rake', 'rgitflow:release:finish', "BRANCH=#{name}"
-    end
+command :'release finish' do |c|
+  c.syntax      = 'rgitflow release finish'
+  c.description = 'Finishes a release branch'
+  c.action do |args, options|
+    RGitFlow::CLI.commandline ['bundle', 'exec', 'rake',
+                               'rgitflow:release:finish'].join(' ')
   end
+end
 
-  class Hotfix < Thor
-    include ::RGitFlow::Console
-
-    desc 'start <name>', 'starts a hotfix branch named <name>'
-    def start(name)
-      run 'bundle', 'exec', 'rake', 'rgitflow:hotfix:start', "BRANCH=#{name}"
-    end
-
-    desc 'finish', 'finishes a hotfix branch'
-    def finish(name)
-      run 'bundle', 'exec', 'rake', 'rgitflow:hotfix:finish', "BRANCH=#{name}"
+command :'hotfix start' do |c|
+  c.syntax      = 'rgitflow hotfix start'
+  c.description = 'Starts a hotfix branch'
+  c.action do |args, options|
+    if args.length == 0
+      RGitFlow::CLI.commandline ['bundle', 'exec', 'rake',
+                                 'rgitflow:hotfix:start'].join(' ')
+    else
+      RGitFlow::CLI.commandline ['bundle', 'exec', 'rake',
+                                 'rgitflow:hotfix:start',
+                                 "BRANCH=#{args[0]}"].join(' ')
     end
   end
+end
 
-  class RGitFlow < Thor
-    include ::RGitFlow::Console
+command :'hotfix finish' do |c|
+  c.syntax      = 'rgitflow hotfix finish'
+  c.description = 'Finishes a hotfix branch'
+  c.action do |args, options|
+    RGitFlow::CLI.commandline ['bundle', 'exec', 'rake',
+                               'rgitflow:hotfix:finish'].join(' ')
+  end
+end
 
-    desc 'status', 'prints out information about which files have changed'
-    def status
-      run 'bundle', 'exec', 'rake', 'rgitflow:scm:status'
+command :'feature start' do |c|
+  c.syntax      = 'rgitflow feature start'
+  c.description = 'Starts a feature branch'
+  c.action do |args, options|
+    if args.length == 0
+      RGitFlow::CLI.commandline ['bundle', 'exec', 'rake',
+                                 'rgitflow:feature:start'].join(' ')
+    else
+      RGitFlow::CLI.commandline ['bundle', 'exec', 'rake',
+                                 'rgitflow:feature:start',
+                                 "BRANCH=#{args[0]}"].join(' ')
     end
+  end
+end
 
-    desc 'feature SUBCOMMAND ...ARGS', 'start or finish a feature branch'
-    subcommand 'feature', Feature
-
-    desc 'release SUBCOMMAND ...ARGS', 'start or finish a release branch'
-    subcommand 'release', Release
-
-    desc 'hotfix SUBCOMMAND ...ARGS', 'start or finish a hotfix branch'
-    subcommand 'hotfix', Hotfix
+command :'feature finish' do |c|
+  c.syntax      = 'rgitflow feature finish'
+  c.description = 'Finishes a feature branch'
+  c.action do |args, options|
+    RGitFlow::CLI.commandline ['bundle', 'exec', 'rake',
+                               'rgitflow:feature:finish'].join(' ')
   end
 end
 
-RGitFlowCLI::RGitFlow.start ARGV
+default_command :help

data/lib/rgitflow/cli.rb

@@ -0,0 +1,19 @@
+require 'rgitflow/console'
+require 'rgitflow/printing'
+
+module RGitFlow
+  class CLI
+    include ::RGitFlow::Printing
+    include ::RGitFlow::Console
+
+    def cli(command)
+      execute command
+    end
+
+    class << self
+      def commandline(command)
+        new.cli command
+      end
+    end
+  end
+end

data/lib/rgitflow/console.rb

@@ -5,16 +5,14 @@ module RGitFlow
 
     protected
 
-    def run(command, *arguments)
-      show_command = [command, *arguments].join ' '
-
+    def execute(command)
       if respond_to? 'debug'
-        debug show_command
+        debug command.to_s
       end
 
-      unless system(command, *arguments)
+      unless system(command.to_s)
         if respond_to? 'error'
-          error "Command failed: #{show_command}"
+          error "Command failed: #{command.to_s}"
         end
         abort
       end

data/rgitflow.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.extra_rdoc_files = `git ls-files -z`.split("\x0").select { |f| f.match(/(.+).(txt|rdoc)/) }
 
   spec.add_dependency 'rake', '~> 10.0'
-  spec.add_dependency 'thor', '~> 0.19'
+  spec.add_dependency 'commander', '~> 4.3'
   spec.add_dependency 'git', '~> 1.2'
   spec.add_dependency 'ansi', '~> 1.5'
 
@@ -30,4 +30,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec', '~> 3.3'
   spec.add_development_dependency 'yard', '~> 0.8'
   spec.add_development_dependency 'codeclimate-test-reporter', '~> 0.4'
+  spec.add_development_dependency 'rubygems-bundler', '~> 1.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rgitflow
 version: !ruby/object:Gem::Version
-  version: 0.2.1.pre.alpha.pre.28
+  version: 0.2.1.pre.alpha.pre.32
 platform: ruby
 authors:
 - Richard Harrah
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-08-27 00:00:00.000000000 Z
+date: 2015-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -25,19 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: commander
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: '4.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: '4.3'
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +122,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.4'
+- !ruby/object:Gem::Dependency
+  name: rubygems-bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.4'
 description: 
 email:
 - topplethenunnery@gmail.com
@@ -150,6 +164,7 @@ files:
 - exe/rgitflow
 - lib/rgitflow.rb
 - lib/rgitflow/autoload.rb
+- lib/rgitflow/cli.rb
 - lib/rgitflow/config.rb
 - lib/rgitflow/console.rb
 - lib/rgitflow/core_ext/object.rb