git_reflow 0.8.9 → 0.8.10

data/_config.yml

@@ -0,0 +1 @@
+theme: jekyll-theme-modernist

data/circle.yml

@@ -7,12 +7,12 @@ dependencies:
     - >
       case $CIRCLE_NODE_INDEX in
        0)
-         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"
+         rvm-exec 2.3.7 gem install bundler
+         rvm-exec 2.3.7 bash -c "bundle check --path=vendor/bundle_2.1 || bundle install --path=vendor/bundle_2.2"
          ;;
        1)
-         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"
+         rvm-exec 2.4.4 gem install bundler
+         rvm-exec 2.4.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.2.7 bundle exec rake ;; 1) rvm-exec 2.3.4 bundle exec rake ;; 2) rvm-exec ruby-head bundle exec rake ;; esac:
+    - case $CIRCLE_NODE_INDEX in 0) rvm-exec 2.3.7 bundle exec rake ;; 1) rvm-exec 2.4.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

@@ -14,30 +14,25 @@ Gem::Specification.new do |s|
   s.test_files       = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables      = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
   s.has_rdoc         = true
-  s.extra_rdoc_files = ['README.rdoc']
   s.bindir           = "exe"
   s.require_paths    = ["lib"]
-  s.rdoc_options     << '--title' << 'git_reflow' << '--main' << 'README.rdoc' << '-ri'
+  s.rdoc_options     << '--title' << 'git_reflow' << '-ri'
 
-  s.add_development_dependency('appraisal', '2.1.0')
-  s.add_development_dependency('bundler', "~> 1.12")
+  s.add_development_dependency('appraisal', '2.2.0')
+  s.add_development_dependency('bundler', "~> 1.16")
   s.add_development_dependency('chronic')
   s.add_development_dependency('pry-byebug')
-  s.add_development_dependency('rake', "~> 11.0")
+  s.add_development_dependency('rake', "~> 12.3")
   s.add_development_dependency('rdoc')
-  s.add_development_dependency('rspec', "~> 3.4.0")
+  s.add_development_dependency('rspec', "~> 3.7.0")
   s.add_development_dependency('webmock')
   s.add_development_dependency('wwtd', '1.3.0')
 
   s.add_dependency('colorize', '>= 0.7.0')
-  s.add_dependency('gli', '2.15.0')
+  s.add_dependency('gli', '2.17.0')
   s.add_dependency('highline')
   s.add_dependency('httpclient')
   s.add_dependency('github_api', '0.15.0')
-  # rack is a dependency of oauth2, which is a dependency of github_api
-  # The latest rack only supports ruby > 2.2.2, so we lock this down until
-  # support for ruby 2.1.x is dropped
-  s.add_dependency('rack', ['>= 1.2', '< 2'])
   s.add_dependency('reenhanced_bitbucket_api', '0.3.2')
 
   s.post_install_message = "You need to setup your GitHub OAuth token\nPlease run 'git-reflow setup'"

data/lib/git_reflow.rb

@@ -22,7 +22,6 @@ require 'git_reflow/git_server/bit_bucket'
 require 'git_reflow/git_server/git_hub'
 require 'git_reflow/logger'
 require 'git_reflow/merge_error'
-require 'git_reflow/os_detector'
 require 'git_reflow/sandbox'
 require 'git_reflow/workflow'
 require 'git_reflow/workflows/core'

data/lib/git_reflow/git_server.rb

@@ -1,63 +1,63 @@
-module GitReflow
-  module GitServer
-    autoload :Base,        'git_reflow/git_server/base'
-    autoload :GitHub,      'git_reflow/git_server/git_hub'
-    autoload :PullRequest, 'git_reflow/git_server/pull_request'
-
-    extend self
-
-    class ConnectionError < StandardError; end
-
-    def connect(options = {})
-      options ||= {}
-      options[:provider] = 'GitHub' if "#{options[:provider]}".length <= 0
-      begin
-        provider_name = options[:provider]
-        provider = provider_class_for(options.delete(:provider)).new(options)
-        provider.authenticate(options.keep_if {|key, value| key == :silent })
-        provider
-      rescue ConnectionError => e
-        GitReflow.say "Error connecting to #{provider_name}: #{e.message}", :error
-      end
-    end
-
-    def connection
-      return nil unless current_provider
-      current_provider.connection
-    end
-
-    def current_provider
-      provider = "#{GitReflow::Config.get('reflow.git-server', local: true)  || GitReflow::Config.get('reflow.git-server')}"
-      if provider.length > 0
-        begin
-          provider_class_for(provider)
-        rescue ConnectionError => e
-          GitReflow.say e.message, :error
-          nil
-        end
-      else
-        GitReflow.say "Reflow hasn't been setup yet.  Run 'git reflow setup' to continue", :notice
-        nil
-      end
-    end
-
-    def can_connect_to?(provider)
-      GitReflow::GitServer.const_defined?(provider)
-    end
-
-    def create_pull_request(options = {})
-      raise "#{self.class.to_s}#create_pull_request method must be implemented"
-    end
-
-    def find_open_pull_request(options = {})
-      raise "#{self.class.to_s}#find_open_pull_request method must be implemented"
-    end
-
-    private
-
-    def provider_class_for(provider)
-      raise ConnectionError, "GitServer not setup for \"#{provider}\"" unless self.can_connect_to?(provider)
-      GitReflow::GitServer.const_get(provider)
-    end
-  end
-end
+module GitReflow
+  module GitServer
+    autoload :Base,        'git_reflow/git_server/base'
+    autoload :GitHub,      'git_reflow/git_server/git_hub'
+    autoload :PullRequest, 'git_reflow/git_server/pull_request'
+
+    extend self
+
+    class ConnectionError < StandardError; end
+
+    def connect(options = {})
+      options ||= {}
+      options[:provider] = 'GitHub' if "#{options[:provider]}".length <= 0
+      begin
+        provider_name = options[:provider]
+        provider = provider_class_for(options.delete(:provider)).new(options)
+        provider.authenticate(options.keep_if {|key, value| key == :silent })
+        provider
+      rescue ConnectionError => e
+        GitReflow.say "Error connecting to #{provider_name}: #{e.message}", :error
+      end
+    end
+
+    def connection
+      return nil unless current_provider
+      current_provider.connection
+    end
+
+    def current_provider
+      provider = "#{GitReflow::Config.get('reflow.git-server', local: true)  || GitReflow::Config.get('reflow.git-server')}"
+      if provider.length > 0
+        begin
+          provider_class_for(provider)
+        rescue ConnectionError => e
+          GitReflow.say e.message, :error
+          nil
+        end
+      else
+        GitReflow.say "Reflow hasn't been setup yet.  Run 'git reflow setup' to continue", :notice
+        nil
+      end
+    end
+
+    def can_connect_to?(provider)
+      GitReflow::GitServer.const_defined?(provider)
+    end
+
+    def create_pull_request(options = {})
+      raise "#{self.class.to_s}#create_pull_request method must be implemented"
+    end
+
+    def find_open_pull_request(options = {})
+      raise "#{self.class.to_s}#find_open_pull_request method must be implemented"
+    end
+
+    private
+
+    def provider_class_for(provider)
+      raise ConnectionError, "GitServer not setup for \"#{provider}\"" unless self.can_connect_to?(provider)
+      GitReflow::GitServer.const_get(provider)
+    end
+  end
+end

data/lib/git_reflow/git_server/bit_bucket.rb

@@ -1,101 +1,101 @@
-require 'bitbucket_rest_api'
-require 'git_reflow/git_helpers'
-
-module GitReflow
-  module GitServer
-    class BitBucket < Base
-      require_relative 'bit_bucket/pull_request'
-
-      attr_accessor :connection
-
-      def initialize(config_options = {})
-        project_only = !!config_options.delete(:project_only)
-
-        # We remove any existing setup first, then setup our required config settings
-        GitReflow::Config.unset('reflow.local-projects', value: "#{self.class.remote_user}/#{self.class.remote_repo_name}")
-        GitReflow::Config.add('reflow.local-projects', "#{self.class.remote_user}/#{self.class.remote_repo_name}") if project_only
-        GitReflow::Config.set('reflow.git-server', 'BitBucket', local: project_only)
-      end
-
-      def self.connection
-        if api_key_setup?
-          @connection ||= ::BitBucket.new login: remote_user, password: api_key
-        end
-      end
-
-      def self.api_endpoint
-        endpoint         = GitReflow::Config.get("bitbucket.endpoint", local: project_only?)
-        (endpoint.length > 0) ? endpoint : ::BitBucket::Configuration::DEFAULT_ENDPOINT
-      end
-
-      def self.site_url
-        site_url     = GitReflow::Config.get("bitbucket.site", local: project_only?)
-        (site_url.length > 0) ? site_url : 'https://bitbucket.org'
-      end
-
-      def self.api_key
-        GitReflow::Config.get("bitbucket.api-key", reload: true, local: project_only?)
-      end
-
-      def self.api_key=(key)
-        GitReflow::Config.set("bitbucket.api-key", key, local: project_only?)
-      end
-      def self.api_key_setup?
-        (self.api_key.length > 0)
-      end
-
-      def self.user
-        GitReflow::Config.get('bitbucket.user', local: project_only?)
-      end
-
-      def self.user=(bitbucket_user)
-        GitReflow::Config.set('bitbucket.user', bitbucket_user, local: project_only?)
-      end
-
-      def authenticate(options = {silent: false})
-        begin
-          if connection and self.class.api_key_setup?
-            unless options[:silent]
-              GitReflow.say "\nYour BitBucket account was already setup with:"
-              GitReflow.say "\tUser Name: #{self.class.user}"
-            end
-          else
-            self.class.user = options[:user] || ask("Please enter your BitBucket username: ")
-            GitReflow.say "\nIn order to connect your BitBucket account,"
-            GitReflow.say "you'll need to generate an API key for your team"
-            GitReflow.say "Visit #{self.class.site_url}/account/user/#{self.class.remote_user}/api-key/, to generate it\n"
-            self.class.api_key = ask("Please enter your team's API key: ")
-            connection.repos.all(self.class.remote_user).count
-            GitReflow.say "Connected to BitBucket\!", :success
-          end
-        rescue ::BitBucket::Error::Unauthorized => e
-          GitReflow::Config.unset('bitbucket.api-key', local: self.class.project_only?)
-          GitReflow.say "Invalid API key for team #{self.class.remote_user}.", :error
-        end
-      end
-
-      def connection
-        @connection ||= self.class.connection
-      end
-
-      def get_build_status(sha)
-        # BitBucket does not currently support build status via API
-        # for updates: https://bitbucket.org/site/master/issue/8548/better-ci-integration-add-a-build-status
-        return nil
-      end
-
-      def colorized_build_description(state, description)
-        ""
-      end
-
-      def create_pull_request(options = {})
-        PullRequest.create(options)
-      end
-
-      def find_open_pull_request(options = {})
-        PullRequest.find_open(options)
-      end
-
-    end
-  end
-end
+require 'bitbucket_rest_api'
+require 'git_reflow/git_helpers'
+
+module GitReflow
+  module GitServer
+    class BitBucket < Base
+      require_relative 'bit_bucket/pull_request'
+
+      attr_reader :connection
+
+      def initialize(config_options = {})
+        project_only = !!config_options.delete(:project_only)
+
+        # We remove any existing setup first, then setup our required config settings
+        GitReflow::Config.unset('reflow.local-projects', value: "#{self.class.remote_user}/#{self.class.remote_repo_name}")
+        GitReflow::Config.add('reflow.local-projects', "#{self.class.remote_user}/#{self.class.remote_repo_name}") if project_only
+        GitReflow::Config.set('reflow.git-server', 'BitBucket', local: project_only)
+      end
+
+      def self.connection
+        if api_key_setup?
+          @connection ||= ::BitBucket.new login: remote_user, password: api_key
+        end
+      end
+
+      def self.api_endpoint
+        endpoint         = GitReflow::Config.get("bitbucket.endpoint", local: project_only?)
+        (endpoint.length > 0) ? endpoint : ::BitBucket::Configuration::DEFAULT_ENDPOINT
+      end
+
+      def self.site_url
+        site_url     = GitReflow::Config.get("bitbucket.site", local: project_only?)
+        (site_url.length > 0) ? site_url : 'https://bitbucket.org'
+      end
+
+      def self.api_key
+        GitReflow::Config.get("bitbucket.api-key", reload: true, local: project_only?)
+      end
+
+      def self.api_key=(key)
+        GitReflow::Config.set("bitbucket.api-key", key, local: project_only?)
+      end
+      def self.api_key_setup?
+        (self.api_key.length > 0)
+      end
+
+      def self.user
+        GitReflow::Config.get('bitbucket.user', local: project_only?)
+      end
+
+      def self.user=(bitbucket_user)
+        GitReflow::Config.set('bitbucket.user', bitbucket_user, local: project_only?)
+      end
+
+      def authenticate(options = {silent: false})
+        begin
+          if connection and self.class.api_key_setup?
+            unless options[:silent]
+              GitReflow.say "\nYour BitBucket account was already setup with:"
+              GitReflow.say "\tUser Name: #{self.class.user}"
+            end
+          else
+            self.class.user = options[:user] || ask("Please enter your BitBucket username: ")
+            GitReflow.say "\nIn order to connect your BitBucket account,"
+            GitReflow.say "you'll need to generate an API key for your team"
+            GitReflow.say "Visit #{self.class.site_url}/account/user/#{self.class.remote_user}/api-key/, to generate it\n"
+            self.class.api_key = ask("Please enter your team's API key: ")
+            connection.repos.all(self.class.remote_user).count
+            GitReflow.say "Connected to BitBucket\!", :success
+          end
+        rescue ::BitBucket::Error::Unauthorized => e
+          GitReflow::Config.unset('bitbucket.api-key', local: self.class.project_only?)
+          GitReflow.say "Invalid API key for team #{self.class.remote_user}.", :error
+        end
+      end
+
+      def connection
+        @connection ||= self.class.connection
+      end
+
+      def get_build_status(sha)
+        # BitBucket does not currently support build status via API
+        # for updates: https://bitbucket.org/site/master/issue/8548/better-ci-integration-add-a-build-status
+        return nil
+      end
+
+      def colorized_build_description(state, description)
+        ""
+      end
+
+      def create_pull_request(options = {})
+        PullRequest.create(options)
+      end
+
+      def find_open_pull_request(options = {})
+        PullRequest.find_open(options)
+      end
+
+    end
+  end
+end