gitx 2.20.0 → 2.21.0.ci.121.1

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: cae1c34c310af1c154b1ba2237bbd53ab0a31607
-  data.tar.gz: a1954f79d5228f6814ddcd102c155bad50f0248a
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NDFhYTIzNmQ0MjUzN2E0OTNhZTNkNjlmY2U1NzU5MDg1ZWRhOWY3NQ==
+  data.tar.gz: !binary |-
+    OTgyZjc2ZTlmM2QxYjkyMTk3MTU3NGU3MWE0NjBlOTA4MjMwNDY3MQ==
 SHA512:
-  metadata.gz: fdaecbebeab3194963248c1a719b91a5e202ee24e7537d7bdc7a3425ef9b1e28d0fdb3c4e5856b232de7f36653eb5106f238784d39359de4c9e4a38af7180b81
-  data.tar.gz: e1bf811116fe5858ce6bfcfa0589a89b45aa3c420217862875cbd58bc0dcd265abba4deed9a874e53b71db468fdbd78cb5be69d51c8d352ad3ba1e78824600aa
+  metadata.gz: !binary |-
+    YzMwYzQwZWE1MTkwYjUxOWY0NDQxNjExMjMyZjIyNDg1NjE1YThlMjcwNDMx
+    ZDFjZjQwM2I2YjNmMDdjOGI0MWY1MWRhOWY5YWQ3Yjk1NTM4YjhjOGI5ODEz
+    MWMxMWIzZDhlYWE4NTVhN2ZjZmRjZmMwZDJjNWNhYmIwNDg0Yzg=
+  data.tar.gz: !binary |-
+    YjhmZmQ1ZjlhZjc3NjgyMGNmNDQ2ZDgyZGM3NTgxMDQwZWNhNDY5NDM0NWVh
+    ZjQ2ZDkyYjQzMGZiZTdkNDYyYTg3ODkwMzRkZjEwMzRiZmFhNTU3MTZmZjMy
+    YTllZDAzMDZmZGQwZDU1Mjk4MTM5NmU4NmRlNTA5YTA4MmZjYjU=

data/lib/gitx.rb

@@ -2,7 +2,3 @@ require 'gitx/version'
 require 'gitx/configuration'
 require 'gitx/extensions/string'
 require 'gitx/extensions/thor'
-
-module Gitx
-  BASE_BRANCH = 'master'
-end

data/lib/gitx/cli/cleanup_command.rb

@@ -7,12 +7,12 @@ module Gitx
     class CleanupCommand < BaseCommand
       desc 'cleanup', 'Cleanup branches that have been merged into master from the repo'
       def cleanup
-        checkout_branch Gitx::BASE_BRANCH
+        checkout_branch config.base_branch
         run_cmd 'git pull'
         run_cmd 'git remote prune origin'
 
         say 'Deleting local and remote branches that have been merged into '
-        say Gitx::BASE_BRANCH, :green
+        say config.base_branch, :green
         merged_branches(remote: true).each do |branch|
           run_cmd "git push origin --delete #{branch}"
         end

data/lib/gitx/cli/integrate_command.rb

@@ -85,7 +85,7 @@ module Gitx
       end
 
       def create_remote_branch(target_branch)
-        repo.create_branch(target_branch, Gitx::BASE_BRANCH)
+        repo.create_branch(target_branch, config.base_branch)
         run_cmd "git push origin #{target_branch}:#{target_branch}"
       end
     end

data/lib/gitx/cli/nuke_command.rb

@@ -21,13 +21,13 @@ module Gitx
         say 'branch to '
         say last_known_good_tag, :green
 
-        checkout_branch Gitx::BASE_BRANCH
+        checkout_branch config.base_branch
         run_cmd "git branch -D #{bad_branch}", allow_failure: true
         run_cmd "git push origin --delete #{bad_branch}", allow_failure: true
         run_cmd "git checkout -b #{bad_branch} #{last_known_good_tag}"
         run_cmd "git push origin #{bad_branch}"
         run_cmd "git branch --set-upstream-to origin/#{bad_branch}"
-        checkout_branch Gitx::BASE_BRANCH
+        checkout_branch config.base_branch
       end
 
       private

data/lib/gitx/cli/release_command.rb

@@ -12,7 +12,7 @@ module Gitx
       desc 'release', 'release the current branch to production'
       method_option :cleanup, type: :boolean, desc: 'cleanup merged branches after release'
       def release(branch = nil)
-        return unless yes?("Release #{current_branch.name} to #{Gitx::BASE_BRANCH}? (y/n)", :green)
+        return unless yes?("Release #{current_branch.name} to #{config.base_branch}? (y/n)", :green)
 
         branch ||= current_branch.name
         assert_not_protected_branch!(branch, 'release')
@@ -22,9 +22,9 @@ module Gitx
         pull_request = find_or_create_pull_request(branch)
         return unless confirm_branch_status?(branch)
 
-        checkout_branch Gitx::BASE_BRANCH
-        run_cmd "git pull origin #{Gitx::BASE_BRANCH}"
-        run_cmd %Q(git merge --no-ff -m "[gitx] Releasing #{branch} to #{Gitx::BASE_BRANCH} (Pull request ##{pull_request.number})" #{branch})
+        checkout_branch config.base_branch
+        run_cmd "git pull origin #{config.base_branch}"
+        run_cmd %Q(git merge --no-ff -m "[gitx] Releasing #{branch} to #{config.base_branch} (Pull request ##{pull_request.number})" #{branch})
         run_cmd 'git push origin HEAD'
 
         after_release

data/lib/gitx/cli/start_command.rb

@@ -15,9 +15,9 @@ module Gitx
           branch_name = ask("What would you like to name your branch? (ex: #{EXAMPLE_BRANCH_NAMES.sample})")
         end
 
-        checkout_branch Gitx::BASE_BRANCH
+        checkout_branch config.base_branch
         run_cmd 'git pull'
-        repo.create_branch branch_name, Gitx::BASE_BRANCH
+        repo.create_branch branch_name, config.base_branch
         checkout_branch branch_name
         run_cmd(%Q(git commit -m "Starting work on #{branch_name} (Issue ##{options[:issue]})" --allow-empty)) if options[:issue]
       end

data/lib/gitx/cli/update_command.rb

@@ -10,10 +10,10 @@ module Gitx
         say 'Updating '
         say "#{current_branch.name} ", :green
         say 'with latest changes from '
-        say Gitx::BASE_BRANCH, :green
+        say config.base_branch, :green
 
         update_branch(current_branch.name) if remote_branch_exists?(current_branch.name)
-        update_branch(Gitx::BASE_BRANCH)
+        update_branch(config.base_branch)
         run_cmd 'git push origin HEAD'
       end
 

data/lib/gitx/configuration.rb

@@ -12,6 +12,10 @@ module Gitx
       @config.merge!(load_config(File.join(root_dir, CONFIG_FILE)))
     end
 
+    def base_branch
+      config[:base_branch]
+    end
+
     def aggregate_branches
       config[:aggregate_branches]
     end

data/lib/gitx/defaults.yml

@@ -1,4 +1,7 @@
 ---
+# default base branch
+base_branch: master
+
 # list of branches eligable for integration
 aggregate_branches:
   - staging

data/lib/gitx/github.rb

@@ -61,17 +61,17 @@ module Gitx
       say 'Creating pull request for '
       say "#{branch} ", :green
       say 'against '
-      say "#{Gitx::BASE_BRANCH} ", :green
+      say "#{config.base_branch} ", :green
       say 'in '
       say github_slug, :green
 
       title = branch.gsub(/[-_]/, ' ')
       body = pull_request_body(branch)
-      github_client.create_pull_request(github_slug, Gitx::BASE_BRANCH, branch, title, body)
+      github_client.create_pull_request(github_slug, config.base_branch, branch, title, body)
     end
 
     def pull_request_body(branch)
-      changelog = run_cmd("git log #{Gitx::BASE_BRANCH}...#{branch} --reverse --no-merges --pretty=format:'* %B'")
+      changelog = run_cmd("git log #{config.base_branch}...#{branch} --reverse --no-merges --pretty=format:'* %B'")
       description = options[:description]
 
       description_template = []

data/lib/gitx/version.rb

@@ -1,3 +1,3 @@
 module Gitx
-  VERSION = '2.20.0'
+  VERSION = '2.21.0'
 end

data/spec/gitx/cli/review_command_spec.rb

@@ -10,7 +10,8 @@ describe Gitx::Cli::ReviewCommand do
     }
   end
   let(:cli) { described_class.new(args, options, config) }
-  let(:repo) { double('fake repo', config: repo_config) }
+  let(:repo) { double('fake repo', config: repo_config, workdir: repo_workdir) }
+  let(:repo_workdir) { File.expand_path(File.join(__dir__, '../../../')) }
   let(:repo_config) do
     {
       'remote.origin.url' => 'https://github.com/wireframe/gitx'

metadata

@@ -1,237 +1,237 @@
 --- !ruby/object:Gem::Specification
 name: gitx
 version: !ruby/object:Gem::Version
-  version: 2.20.0
+  version: 2.21.0.ci.121.1
 platform: ruby
 authors:
 - Ryan Sonnek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-03 00:00:00.000000000 Z
+date: 2015-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rugged
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.23.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.23.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: octokit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: terminal-notifier
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: terminal-notifier-guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Git eXtensions for improved development workflows
@@ -251,13 +251,13 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".gitx.yml"
-- ".hound.yml"
-- ".rspec"
-- ".rubocop.yml"
-- ".ruby-version"
-- ".travis.yml"
+- .gitignore
+- .gitx.yml
+- .hound.yml
+- .rspec
+- .rubocop.yml
+- .ruby-version
+- .travis.yml
 - CONTRIBUTING.md
 - Gemfile
 - Guardfile
@@ -326,17 +326,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Utility scripts for Git to increase productivity for common operations
@@ -364,4 +364,3 @@ test_files:
 - spec/support/timecop.rb
 - spec/support/vcr.rb
 - spec/support/webmock.rb
-has_rdoc: