gitx 2.22.0 → 2.23.0.ci.162.1

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 07098949fd21d2a0e08b1969137da1bb944acb54
-  data.tar.gz: 9212b46915d017b5effe701ae020988bda67504b
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ODQ2MjRhNGE4MGUzZWIyMzlmYmQzMTYxNjUwMTM4Y2M0MTUzMzE4Mg==
+  data.tar.gz: !binary |-
+    NTAyYjE5M2I2MGM2ZmM0YzhlYjk5NDE4NzM0MGMyMWQ1MjYxYjkyYw==
 SHA512:
-  metadata.gz: 4a806f737406c08ecd1c0c80faf05555a315aa191c36329b37487e54e3528cf2031b7c9894be1f734b6e20b51859b5fb6a8fce0b8bb164f21e60b8d4aa967b15
-  data.tar.gz: 013eb178fc4093c5f7f90dc622ba376cbf075c6654260041310c11b1a9a9ab5e124d4f44c863a867f1abd16ca2ac396babfacb551517de96877c70345a247967
+  metadata.gz: !binary |-
+    NTViYmU2YmUxMTNmZGRkMmNjN2I4ZDlkMGI5ZGZhNDNhODMzNWRkMmVkZDZj
+    NjI5MjVlMDFmNzhiNDM1NzZiZjM1OTY4MjQ2ZWJhYTlhMmQ4N2NlMmM0Yjc4
+    ODI0ZTgzMmI1NjZkMmZiNWY5NWFhMjdiZGQ3M2I0Y2E3NzhiZjc=
+  data.tar.gz: !binary |-
+    NWNiNDA4ZjExNWE5OTdhNjU2YTQ2Y2U1MzNhNWEwNjk5NGE4ZmJiMjNhOTli
+    NzQ3ODk5YzE3MDAyYTM4ZGRiMTFiNTNmZWU0OWVlMGRjZDE4OTQ1MjQ1MjVi
+    ZDhiYTA0MDhkYjYzMzUyYzk2ZGRhYTUzNDk0MTllY2VjMmFmMDE=

data/gitx.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'rugged', '~> 0.23.0'
+  spec.add_runtime_dependency 'rugged', '~> 0.24.0'
   spec.add_runtime_dependency 'thor'
   spec.add_runtime_dependency 'octokit'
 

data/lib/gitx/cli/cleanup_command.rb

@@ -31,7 +31,7 @@ module Gitx
         output = run_git_cmd('branch', *args).split("\n")
         branches = output.map do |branch|
           branch = branch.gsub(/\*/, '').strip.split(' ').first
-          branch = branch.split('/').last if options[:remote]
+          branch = branch.gsub('origin/', '') if options[:remote]
           branch
         end
         branches.uniq!

data/lib/gitx/cli/start_command.rb

@@ -26,12 +26,13 @@ module Gitx
 
       def valid_new_branch_name?(branch)
         return false if repo_branches.include?(branch)
-        branch =~ VALID_BRANCH_NAME_REGEX
+        Rugged::Reference.valid_name?("refs/heads/#{branch}")
       end
 
+      # get list of local and remote branches
       def repo_branches
         @branch_names ||= repo.branches.each_name.map do |branch|
-          branch.split('/').last
+          branch.gsub('origin/', '')
         end
       end
     end

data/lib/gitx/configuration.rb

@@ -1,4 +1,5 @@
 require 'yaml'
+require 'thor/core_ext/hash_with_indifferent_access'
 
 module Gitx
   class Configuration

data/lib/gitx/version.rb

@@ -1,3 +1,3 @@
 module Gitx
-  VERSION = '2.22.0'
+  VERSION = '2.23.0'
 end

data/spec/gitx/cli/cleanup_command_spec.rb

@@ -12,29 +12,79 @@ describe Gitx::Cli::CleanupCommand do
   let(:cli) { described_class.new(args, options, config) }
   let(:executor) { cli.send(:executor) }
   let(:branch) { double('fake branch', name: 'feature-branch') }
-  let(:remote_branches) { 'merged-remote-feature' }
-  let(:local_branches) { 'merged-local-feature' }
+  let(:remote_branches) { '' }
+  let(:local_branches) { '' }
 
   before do
     allow(cli).to receive(:current_branch).and_return(branch)
   end
 
   describe '#cleanup' do
-    before do
-      allow(cli).to receive(:say)
-
-      expect(executor).to receive(:execute).with('git', 'checkout', 'master').ordered
-      expect(executor).to receive(:execute).with('git', 'pull').ordered
-      expect(executor).to receive(:execute).with('git', 'remote', 'prune', 'origin').ordered
-      expect(executor).to receive(:execute).with('git', 'branch', '--remote', '--merged').and_return(remote_branches).ordered
-      expect(executor).to receive(:execute).with('git', 'push', 'origin', '--delete', 'merged-remote-feature').ordered
-      expect(executor).to receive(:execute).with('git', 'branch', '--merged').and_return(local_branches).ordered
-      expect(executor).to receive(:execute).with('git', 'branch', '--delete', 'merged-local-feature').ordered
-
-      cli.cleanup
+    context 'when merged local branches exist' do
+      let(:local_branches) do
+        <<-EOS.dedent
+        merged-local-feature
+        EOS
+      end
+      before do
+        allow(cli).to receive(:say)
+
+        expect(executor).to receive(:execute).with('git', 'checkout', 'master').ordered
+        expect(executor).to receive(:execute).with('git', 'pull').ordered
+        expect(executor).to receive(:execute).with('git', 'remote', 'prune', 'origin').ordered
+        expect(executor).to receive(:execute).with('git', 'branch', '--remote', '--merged').and_return(remote_branches).ordered
+        expect(executor).to receive(:execute).with('git', 'branch', '--merged').and_return(local_branches).ordered
+        expect(executor).to receive(:execute).with('git', 'branch', '--delete', 'merged-local-feature').ordered
+
+        cli.cleanup
+      end
+      it 'runs expected commands' do
+        should meet_expectations
+      end
     end
-    it 'runs expected commands' do
-      should meet_expectations
+    context 'when merged remote branches exist' do
+      let(:remote_branches) do
+        <<-EOS.dedent
+        origin/merged-remote-feature
+        EOS
+      end
+      before do
+        allow(cli).to receive(:say)
+
+        expect(executor).to receive(:execute).with('git', 'checkout', 'master').ordered
+        expect(executor).to receive(:execute).with('git', 'pull').ordered
+        expect(executor).to receive(:execute).with('git', 'remote', 'prune', 'origin').ordered
+        expect(executor).to receive(:execute).with('git', 'branch', '--remote', '--merged').and_return(remote_branches).ordered
+        expect(executor).to receive(:execute).with('git', 'push', 'origin', '--delete', 'merged-remote-feature').ordered
+        expect(executor).to receive(:execute).with('git', 'branch', '--merged').and_return(local_branches).ordered
+
+        cli.cleanup
+      end
+      it 'runs expected commands' do
+        should meet_expectations
+      end
+    end
+    context 'when mreged remote branches with slash exist' do
+      let(:remote_branches) do
+        <<-EOS.dedent
+        origin/merged-remote-feature/review
+        EOS
+      end
+      before do
+        allow(cli).to receive(:say)
+
+        expect(executor).to receive(:execute).with('git', 'checkout', 'master').ordered
+        expect(executor).to receive(:execute).with('git', 'pull').ordered
+        expect(executor).to receive(:execute).with('git', 'remote', 'prune', 'origin').ordered
+        expect(executor).to receive(:execute).with('git', 'branch', '--remote', '--merged').and_return(remote_branches).ordered
+        expect(executor).to receive(:execute).with('git', 'push', 'origin', '--delete', 'merged-remote-feature/review').ordered
+        expect(executor).to receive(:execute).with('git', 'branch', '--merged').and_return(local_branches).ordered
+
+        cli.cleanup
+      end
+      it 'runs expected commands' do
+        should meet_expectations
+      end
     end
   end
 end

data/spec/gitx/cli/start_command_spec.rb

@@ -27,6 +27,19 @@ describe Gitx::Cli::StartCommand do
         should meet_expectations
       end
     end
+    context 'when user inputs branch with slash' do
+      before do
+        expect(cli).to receive(:checkout_branch).with('master').ordered
+        expect(executor).to receive(:execute).with('git', 'pull').ordered
+        expect(repo).to receive(:create_branch).with('foo/ryan', 'master').ordered
+        expect(cli).to receive(:checkout_branch).with('foo/ryan').ordered
+
+        cli.start 'foo/ryan'
+      end
+      it do
+        should meet_expectations
+      end
+    end
     context 'when user does not input a branch name' do
       before do
         expect(cli).to receive(:ask).and_return('new-branch')

metadata

@@ -1,237 +1,237 @@
 --- !ruby/object:Gem::Specification
 name: gitx
 version: !ruby/object:Gem::Version
-  version: 2.22.0
+  version: 2.23.0.ci.162.1
 platform: ruby
 authors:
 - Ryan Sonnek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-28 00:00:00.000000000 Z
+date: 2016-04-18 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
+        version: 0.24.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.23.0
+        version: 0.24.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
@@ -328,17 +328,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
@@ -367,4 +367,3 @@ test_files:
 - spec/support/timecop.rb
 - spec/support/vcr.rb
 - spec/support/webmock.rb
-has_rdoc: