git_reflow 0.8.6 → 0.8.7

data/Rakefile

@@ -1,8 +1,8 @@
-#!/usr/bin/env rake
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
-
-RSpec::Core::RakeTask.new(:spec)
-
-task :default => :spec
-
+#!/usr/bin/env rake
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec
+

data/bin/console

@@ -1,7 +1,7 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "git_reflow"
-
-require "irb"
-IRB.start
+#!/usr/bin/env ruby
+
+require "bundler/setup"
+require "git_reflow"
+
+require "irb"
+IRB.start

data/bin/setup

@@ -1,6 +1,6 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+bundle install

data/circle.yml

@@ -7,12 +7,12 @@ dependencies:
     - >
       case $CIRCLE_NODE_INDEX in
        0)
-         rvm-exec 2.1.9 gem install bundler
-         rvm-exec 2.1.9 bash -c "bundle check --path=vendor/bundle_2.1 || bundle install --path=vendor/bundle_2.1"
+         rvm-exec 2.2.7 gem install bundler
+         rvm-exec 2.2.7 bash -c "bundle check --path=vendor/bundle_2.1 || bundle install --path=vendor/bundle_2.2"
          ;;
        1)
-         rvm-exec 2.2.5 gem install bundler
-         rvm-exec 2.2.5 bash -c "bundle check --path=vendor/bundle_2.2 || bundle install --path=vendor/bundle_2.2"
+         rvm-exec 2.3.4 gem install bundler
+         rvm-exec 2.3.4 bash -c "bundle check --path=vendor/bundle_2.2 || bundle install --path=vendor/bundle_2.3"
          ;;
        2)
          rvm-exec ruby-head gem install bundler
@@ -22,5 +22,5 @@ dependencies:
 
 test:
   override:
-    - case $CIRCLE_NODE_INDEX in 0) rvm-exec 2.1.9 bundle exec rake ;; 1) rvm-exec 2.2.5 bundle exec rake ;; 2) rvm-exec ruby-head bundle exec rake ;; esac:
+    - case $CIRCLE_NODE_INDEX in 0) rvm-exec 2.2.7 bundle exec rake ;; 1) rvm-exec 2.3.4 bundle exec rake ;; 2) rvm-exec ruby-head bundle exec rake ;; esac:
         parallel: true

data/exe/git-reflow

@@ -1,36 +1,36 @@
-#!/usr/bin/env ruby
-$: << File.expand_path(File.dirname(File.realpath(__FILE__)) + '/../lib')
-require 'rubygems'
-require 'gli'
-require 'git_reflow'
-
-include GLI::App
-
-program_desc 'Git Reflow manages your git workflow.'
-
-version GitReflow::VERSION
-
-commands_from 'git_reflow/commands'
-
-pre do |global,command,options,args|
-  # Pre logic here
-  # Return true to proceed; false to abourt and not call the
-  # chosen command
-  # Use skips_pre before a command to skip this block
-  # on that command only
-  true
-end
-
-post do |global,command,options,args|
-  # Post logic here
-  # Use skips_post before a command to skip this
-  # block on that command only
-end
-
-on_error do |exception|
-  # Error logic here
-  # return false to skip default error handling
-  true
-end
-
-exit run(ARGV)
+#!/usr/bin/env ruby
+$: << File.expand_path(File.dirname(File.realpath(__FILE__)) + '/../lib')
+require 'rubygems'
+require 'gli'
+require 'git_reflow'
+
+include GLI::App
+
+program_desc 'Git Reflow manages your git workflow.'
+
+version GitReflow::VERSION
+
+commands_from 'git_reflow/commands'
+
+pre do |global,command,options,args|
+  # Pre logic here
+  # Return true to proceed; false to abourt and not call the
+  # chosen command
+  # Use skips_pre before a command to skip this block
+  # on that command only
+  true
+end
+
+post do |global,command,options,args|
+  # Post logic here
+  # Use skips_post before a command to skip this
+  # block on that command only
+end
+
+on_error do |exception|
+  # Error logic here
+  # return false to skip default error handling
+  true
+end
+
+exit run(ARGV)

data/git_reflow.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency('wwtd', '1.3.0')
 
   s.add_dependency('colorize', '>= 0.7.0')
-  s.add_dependency('gli', '2.14.0')
+  s.add_dependency('gli', '2.15.0')
   s.add_dependency('highline')
   s.add_dependency('httpclient')
   s.add_dependency('github_api', '0.15.0')

data/lib/git_reflow/commands/deliver.rb

@@ -1,10 +1,10 @@
-desc 'deliver your feature branch'
-long_desc 'merge your feature branch down to your base branch, and cleanup your feature branch'
-
-command :deliver do |c|
-  c.desc 'merge your feature branch down to your base branch, and cleanup your feature branch'
-  c.switch [:f, :'skip-lgtm'], desc: 'skip the lgtm checks and deliver your feature branch'
-  c.action do |global_options, options, args|
-    GitReflow.deliver base: args[0], force: options[:'skip-lgtm']
-  end
-end
+desc 'deliver your feature branch'
+long_desc 'merge your feature branch down to your base branch, and cleanup your feature branch'
+
+command :deliver do |c|
+  c.desc 'merge your feature branch down to your base branch, and cleanup your feature branch'
+  c.switch [:f, :'skip-lgtm'], desc: 'skip the lgtm checks and deliver your feature branch'
+  c.action do |global_options, options, args|
+    GitReflow.deliver base: args[0], force: options[:'skip-lgtm']
+  end
+end

data/lib/git_reflow/commands/refresh.rb

@@ -1,20 +1,20 @@
-desc 'Updates and synchronizes your base branch and feature branch.'
-long_desc <<LONGTIME
-  Performs the following:\n
-  \t$ git checkout <base_branch>\n
-  \t$ git pull <remote_location> <base_branch>\n
-  \t$ git checkout <current_branch>\n
-  \t$ git pull origin <current_branch>\n
-  \t$ git merge <base_branch>\n
-LONGTIME
-arg_name '[remote_location] - remote repository name to fetch updates from (origin by default), [base_branch] - branch that you want to merge with (master by default)'
-command :refresh do |c|
-  c.desc 'updates base_branch based on remote and merges the base with your feature_branch'
-  c.flag [:r,:remote], default_value: 'origin'
-  c.flag [:b,:base], default_value: 'master'
-  c.action do |global_options, options, args|
-
-    GitReflow.refresh base: options[:base], remote: options[:remote]
-
-  end
-end
+desc 'Updates and synchronizes your base branch and feature branch.'
+long_desc <<LONGTIME
+  Performs the following:\n
+  \t$ git checkout <base_branch>\n
+  \t$ git pull <remote_location> <base_branch>\n
+  \t$ git checkout <current_branch>\n
+  \t$ git pull origin <current_branch>\n
+  \t$ git merge <base_branch>\n
+LONGTIME
+arg_name '[remote_location] - remote repository name to fetch updates from (origin by default), [base_branch] - branch that you want to merge with (master by default)'
+command :refresh do |c|
+  c.desc 'updates base_branch based on remote and merges the base with your feature_branch'
+  c.flag [:r,:remote], default_value: 'origin'
+  c.flag [:b,:base], default_value: 'master'
+  c.action do |global_options, options, args|
+
+    GitReflow.refresh base: options[:base], remote: options[:remote]
+
+  end
+end

data/lib/git_reflow/commands/review.rb

@@ -1,13 +1,13 @@
-desc 'review will push your latest feature branch changes to your remote repo and create a pull request'
-arg_name 'Describe arguments to review here'
-command :review do |c|
-  c.desc 'push your latest feature branch changes to your remote repo and create a pull request against the destination branch'
-  c.arg_name '[destination_branch] - the branch you want to merge your feature branch into'
-  c.flag [:t, :title]
-  c.flag [:m, :message]
-  c.action do |global_options,options,args|
-
-    GitReflow.review base: args[0], title: options[:title], body: options[:message]
-
-  end
-end
+desc 'review will push your latest feature branch changes to your remote repo and create a pull request'
+arg_name 'Describe arguments to review here'
+command :review do |c|
+  c.desc 'push your latest feature branch changes to your remote repo and create a pull request against the destination branch'
+  c.arg_name '[destination_branch] - the branch you want to merge your feature branch into'
+  c.flag [:t, :title]
+  c.flag [:m, :message]
+  c.action do |global_options,options,args|
+
+    GitReflow.review base: args[0], title: options[:title], body: options[:message]
+
+  end
+end

data/lib/git_reflow/commands/setup.rb

@@ -1,11 +1,11 @@
-desc 'Setup your GitHub account'
-command :setup do |c|
-  c.desc 'sets up your api token with GitHub'
-  c.switch [:l, :local], default_value: false, desc: 'setup GitReflow for the current project only'
-  c.switch [:e, :enterprise], default_value: false, desc: 'setup GitReflow with a Github Enterprise account'
-  c.action do |global_options, options, args|
-
-    GitReflow.setup local: options[:local], enterprise: options[:enterprise]
-
-  end
-end
+desc 'Setup your GitHub account'
+command :setup do |c|
+  c.desc 'sets up your api token with GitHub'
+  c.switch [:l, :local], default_value: false, desc: 'setup GitReflow for the current project only'
+  c.switch [:e, :enterprise], default_value: false, desc: 'setup GitReflow with a Github Enterprise account'
+  c.action do |global_options, options, args|
+
+    GitReflow.setup local: options[:local], enterprise: options[:enterprise]
+
+  end
+end

data/lib/git_reflow/commands/stage.rb

@@ -1,9 +1,9 @@
-desc 'Deliver your changes to a staging server'
-command :stage do |c|
-  c.desc 'deliver your feature branch to the staging branch'
-  c.action do |global_options, options, args|
-
-    GitReflow.stage
-
-  end
-end
+desc 'Deliver your changes to a staging server'
+command :stage do |c|
+  c.desc 'deliver your feature branch to the staging branch'
+  c.action do |global_options, options, args|
+
+    GitReflow.stage
+
+  end
+end

data/lib/git_reflow/commands/start.rb

@@ -1,22 +1,22 @@
-
-desc 'Start will create a new feature branch and setup remote tracking'
-long_desc <<LONGTIME
-  Performs the following:\n
-  \t$ git checkout <base_branch>\n
-  \t$ git pull origin <base_branch>\n
-  \t$ git push origin <base_branch>:refs/heads/[new_feature_branch]\n
-  \t$ git checkout --track -b [new_feature_branch] origin/[new_feature_branch]\n
-LONGTIME
-arg_name '[new-feature-branch-name] - name of the new feature branch'
-command :start do |c|
-  c.flag [:b,:base], default_value: 'master'
-  c.action do |global_options, options, args|
-
-    if args.empty?
-      raise "usage: git-reflow start [new-branch-name]"
-    else
-      GitReflow.start feature_branch: args[0], base: options[:base]
-    end
-
-  end
-end
+
+desc 'Start will create a new feature branch and setup remote tracking'
+long_desc <<LONGTIME
+  Performs the following:\n
+  \t$ git checkout <base_branch>\n
+  \t$ git pull origin <base_branch>\n
+  \t$ git push origin <base_branch>:refs/heads/[new_feature_branch]\n
+  \t$ git checkout --track -b [new_feature_branch] origin/[new_feature_branch]\n
+LONGTIME
+arg_name '[new-feature-branch-name] - name of the new feature branch'
+command :start do |c|
+  c.flag [:b,:base], default_value: 'master'
+  c.action do |global_options, options, args|
+
+    if args.empty?
+      raise "usage: git-reflow start [new-branch-name]"
+    else
+      GitReflow.start feature_branch: args[0], base: options[:base]
+    end
+
+  end
+end

data/lib/git_reflow/commands/status.rb

@@ -1,7 +1,7 @@
-desc 'Display information about the status of your feature in the review process'
-arg_name "destination_branch - the branch you're merging your feature into ('master' is default)"
-command :status do |c|
-  c.action do |global_options, options, args|
-    GitReflow.status destination_branch: args[0]
-  end
-end
+desc 'Display information about the status of your feature in the review process'
+arg_name "destination_branch - the branch you're merging your feature into ('master' is default)"
+command :status do |c|
+  c.action do |global_options, options, args|
+    GitReflow.status destination_branch: args[0]
+  end
+end

data/lib/git_reflow/config.rb

@@ -10,9 +10,9 @@ module GitReflow
       else
         local = local ? '--local ' : ''
         if all
-          new_value = GitReflow::Sandbox.run "git config #{local}--get-all #{key}", loud: false
+          new_value = GitReflow::Sandbox.run "git config #{local}--get-all #{key}", loud: false, blocking: false
         else
-          new_value = GitReflow::Sandbox.run "git config #{local}--get #{key}", loud: false
+          new_value = GitReflow::Sandbox.run "git config #{local}--get #{key}", loud: false, blocking: false
         end
         instance_variable_set(:"@#{key.tr('.-', '_')}", new_value.strip)
       end
@@ -21,28 +21,28 @@ module GitReflow
     def set(key, value, local: false)
       value = "#{value}".strip
       if local
-        GitReflow::Sandbox.run "git config --replace-all #{key} \"#{value}\"", loud: false
+        GitReflow::Sandbox.run "git config --replace-all #{key} \"#{value}\"", loud: false, blocking: false
       else
-        GitReflow::Sandbox.run "git config -f #{CONFIG_FILE_PATH} --replace-all #{key} \"#{value}\"", loud: false
+        GitReflow::Sandbox.run "git config -f #{CONFIG_FILE_PATH} --replace-all #{key} \"#{value}\"", loud: false, blocking: false
       end
     end
 
     def unset(key, value: nil, local: false)
       value = (value.nil?) ? "" : "\"#{value}\""
       if local
-        GitReflow::Sandbox.run "git config --unset-all #{key} #{value}", loud: false
+        GitReflow::Sandbox.run "git config --unset-all #{key} #{value}", loud: false, blocking: false
       else
-        GitReflow::Sandbox.run "git config -f #{CONFIG_FILE_PATH} --unset-all #{key} #{value}", loud: false
+        GitReflow::Sandbox.run "git config -f #{CONFIG_FILE_PATH} --unset-all #{key} #{value}", loud: false, blocking: false
       end
     end
 
     def add(key, value, local: false, global: false)
       if global
-        GitReflow::Sandbox.run "git config --global --add #{key} \"#{value}\"", loud: false
+        GitReflow::Sandbox.run "git config --global --add #{key} \"#{value}\"", loud: false, blocking: false
       elsif local
-        GitReflow::Sandbox.run "git config --add #{key} \"#{value}\"", loud: false
+        GitReflow::Sandbox.run "git config --add #{key} \"#{value}\"", loud: false, blocking: false
       else
-        GitReflow::Sandbox.run "git config -f #{CONFIG_FILE_PATH} --add #{key} \"#{value}\"", loud: false
+        GitReflow::Sandbox.run "git config -f #{CONFIG_FILE_PATH} --add #{key} \"#{value}\"", loud: false, blocking: false
       end
     end
   end

data/lib/git_reflow/git_server/base.rb

@@ -1,68 +1,68 @@
-require 'git_reflow/config'
-
-module GitReflow
-  class GitServer::Base
-    extend GitHelpers
-
-    @@connection = nil
-
-    def initialize(options)
-      site_url     = self.class.site_url
-      api_endpoint = self.class.api_endpoint
-
-      self.class.site_url     = site_url
-      self.class.api_endpoint = api_endpoint
-
-      authenticate
-    end
-
-    def self.connection
-      raise "#{self.class.to_s}.connection method must be implemented"
-    end
-
-    def self.user
-      raise "#{self.class.to_s}.user method must be implemented"
-    end
-
-    def self.api_endpoint
-      raise "#{self.class.to_s}.api_endpoint method must be implemented"
-    end
-
-    def self.api_endpoint=(api_endpoint, options = {local: false})
-      raise "#{self.class.to_s}.api_endpoint= method must be implemented"
-    end
-
-    def self.site_url
-      raise "#{self.class.to_s}.site_url method must be implemented"
-    end
-
-    def self.site_url=(site_url, options = {local: false})
-      raise "#{self.class.to_s}.site_url= method must be implemented"
-    end
-
-    def self.project_only?
-      GitReflow::Config.get("reflow.local-projects", all: true).include? "#{remote_user}/#{remote_repo_name}"
-    end
-
-    def connection
-      @connection ||= self.class.connection
-    end
-
-    def authenticate
-      raise "#{self.class.to_s}#authenticate method must be implemented"
-    end
-
-    def find_open_pull_request(options)
-      raise "#{self.class.to_s}#find_open_pull_request(options) method must be implemented"
-    end
-
-    def get_build_status sha
-      raise "#{self.class.to_s}#get_build_status(sha) method must be implemented"
-    end
-
-    def colorized_build_description status
-      raise "#{self.class.to_s}#colorized_build_description(status) method must be implemented"
-    end
-
-  end
-end
+require 'git_reflow/config'
+
+module GitReflow
+  class GitServer::Base
+    extend GitHelpers
+
+    @@connection = nil
+
+    def initialize(options)
+      site_url     = self.class.site_url
+      api_endpoint = self.class.api_endpoint
+
+      self.class.site_url     = site_url
+      self.class.api_endpoint = api_endpoint
+
+      authenticate
+    end
+
+    def self.connection
+      raise "#{self.class.to_s}.connection method must be implemented"
+    end
+
+    def self.user
+      raise "#{self.class.to_s}.user method must be implemented"
+    end
+
+    def self.api_endpoint
+      raise "#{self.class.to_s}.api_endpoint method must be implemented"
+    end
+
+    def self.api_endpoint=(api_endpoint, options = {local: false})
+      raise "#{self.class.to_s}.api_endpoint= method must be implemented"
+    end
+
+    def self.site_url
+      raise "#{self.class.to_s}.site_url method must be implemented"
+    end
+
+    def self.site_url=(site_url, options = {local: false})
+      raise "#{self.class.to_s}.site_url= method must be implemented"
+    end
+
+    def self.project_only?
+      GitReflow::Config.get("reflow.local-projects", all: true).include? "#{remote_user}/#{remote_repo_name}"
+    end
+
+    def connection
+      @connection ||= self.class.connection
+    end
+
+    def authenticate
+      raise "#{self.class.to_s}#authenticate method must be implemented"
+    end
+
+    def find_open_pull_request(options)
+      raise "#{self.class.to_s}#find_open_pull_request(options) method must be implemented"
+    end
+
+    def get_build_status sha
+      raise "#{self.class.to_s}#get_build_status(sha) method must be implemented"
+    end
+
+    def colorized_build_description status
+      raise "#{self.class.to_s}#colorized_build_description(status) method must be implemented"
+    end
+
+  end
+end