git-pcheckout 0.0.3 → 0.0.4

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MzYzOTQ2MmI0N2ZhZTBlZjdhYWYwY2U3NGRmNjk5OTU0MmJiMGI2OA==
-  data.tar.gz: !binary |-
-    OTA2NTE0NmRmMTVmNTU0NGNjNTkyMjIwZWQ4OTEwMTZjMWUwYTI4Yw==
+SHA1:
+  metadata.gz: 19ebb7be03ae20a913488690729afd281e5989a4
+  data.tar.gz: 5df1feabe877b12315955ce0b0b8d480ad49cb9c
 SHA512:
-  metadata.gz: !binary |-
-    M2IxMGI3Nzg0M2ZmNDYwMGI4MzM2YjI2Yjc5MWFlNjZmYjU0ZThjNWRmNWVl
-    NzNlZTE0NjZjY2ZiNDJkNjQzY2RkNzA2ZGJhYWUzZmI4NjQ4M2Q5ZmQ5ZDQ5
-    YTBkZTE2Njk4Njg2ZmRkNjVhMjgwNjJmNWY1NjYyNGQwODM0ZWM=
-  data.tar.gz: !binary |-
-    NDE1YTI4ZjQyYjBhYmMxMDkyZjBjM2JkOGZmYTZhNmJhZTQzMjM2N2MyZTJh
-    YjkzYThlOGNkNTRkYTE1N2ZmMWViN2Q3ZWYzNjk2NjkwZThjMzllNzllMmVl
-    YzBiZTRhM2ZkOTY5ZjRkZTE3MmI3YjhiM2E4YzAzYzVlZDYxOWQ=
+  metadata.gz: e3064c7df5e48508363f0105cc20aec8faae792a18df9ebc2b70e7ea6dafe73f271bd67bf3ae98b807a7bc2adcb4f184fa45bcd18e89d3083b803a354025db16
+  data.tar.gz: 3f32fbaa2c8a1ac25bff5857a09238acce97de293e008b0e1c712e29e6d7a0a9c138b92278e9f5251d392b05db6b98cee20bbd1451e73919e9b6733c11d4ecec

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--format progress

data/README.md

@@ -1,7 +1,11 @@
 # git-pcheckout
 
-Git command to evenly checkout local/remote branches and source/forks
-pull pequests by URL (with Hub)
+[![Build Status](https://api.travis-ci.org/vrybas/git-pcheckout.svg)][travis]
+[![Gem Version](http://img.shields.io/gem/v/git-pcheckout.svg)][gem]
+[![Code Climate](http://img.shields.io/codeclimate/github/vrybas/git-pcheckout.svg)][codeclimate]
+
+Git command to evenly checkout local/remote branches and source/fork
+pull requests by URL (with Hub)
 
 ## Installation
 
@@ -17,20 +21,20 @@ pull pequests by URL (with Hub)
 
 ## What it does
 
-If specified _branch-name_ exists locally:
+1. If specified _branch-name_ exists locally:
 
     $ git checkout branch-name
     $ git pull origin branch-name
 
-If specified _branch-name_ not exist locally:
+2. If specified _branch-name_ not exist locally:
 
     $ git fetch
     $ git checkout --track origin/branch-name
 
-If pull request URL specified(from fork):
+3. If pull request URL specified(from fork):
   - pulls fork branch with Hub
 
-If pull request URL specified(from source repo):
+4. If pull request URL specified(from source repo):
   - treats it as if just a _branch_name_ was specified (goto 1)
 
 ## Contributing
@@ -42,3 +46,6 @@ If pull request URL specified(from source repo):
 5. Create new Pull Request
 
 [1]: http://hub.github.com/
+[travis]: https://travis-ci.org/vrybas/git-pcheckout
+[gem]: http://rubygems.org/gems/git-pcheckout
+[codeclimate]: https://codeclimate.com/github/vrybas/git-pcheckout

data/Rakefile

@@ -1 +1,4 @@
 require "bundler/gem_tasks"
+require 'rspec/core/rake_task'
+task :default => :spec
+RSpec::Core::RakeTask.new

data/bin/git-pcheckout

@@ -16,6 +16,6 @@
 # If pull request URL specified(from source repo):
 #   - treats it as if just a branch name was specified (goto 1)
 
-require_relative '../git-pcheckout.rb'
+require_relative '../lib/git-pcheckout.rb'
 
-GitPcheckout.(ARGV[0])
+GitPcheckout::Base.new(ARGV[0]).perform

data/git-pcheckout.gemspec.lock

@@ -0,0 +1,7 @@
+GEM
+  specs:
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES

data/lib/{handle-branch.rb → git-pcheckout/handle_branch.rb}

@@ -1,14 +1,10 @@
 class HandleBranch < Struct.new(:branch)
 
-  def self.call(*args)
-    new(*args).call
-  end
-
   def initialize(branch)
     self.branch = branch
   end
 
-  def call
+  def perform
     if branch_exists_locally?
       checkout_local_branch && pull_from_origin
     else

data/lib/git-pcheckout/version.rb

@@ -1,3 +1,3 @@
 module GitPcheckout
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/{git-pcheckout.rb → lib/git-pcheckout.rb}

@@ -1,32 +1,35 @@
-require_relative 'lib/handle-branch.rb'
+require_relative 'git-pcheckout/handle_branch'
 
-class GitPcheckout < Struct.new(:arg)
-
-  def self.call(*args)
-    new(*args).call
-  end
+module GitPcheckout
+  class Base < Struct.new(:arg)
+    def initialize(arg)
+      self.arg = arg
+    end
 
-  def initialize(arg)
-    self.arg = arg
-  end
+    def perform
+      validate_current_branch_state
 
-  def call
-    if pull_request_url?(arg)
-      handle_pull_request_url(arg)
-    else
-      handle_branch_name(arg)
+      if pull_request_url?(arg)
+        handle_pull_request_url(arg)
+      else
+        handle_branch_name(arg)
+      end
     end
-  end
 
-  private
+    private
+
+    def validate_current_branch_state
+      if dirty_branch?
+        puts errors[:dirty_branch]
+        exit(1)
+      end
+    end
 
     def pull_request_url?(arg)
       arg.match /https:\/\/github.com\//
     end
 
     def handle_pull_request_url(url)
-      puts "handling Pull Request URL..."
-
       branch_name_with_prefix = checkout_pull_request_branch(url)
 
       if source_repository_branch?(branch_name_with_prefix)
@@ -35,6 +38,7 @@ class GitPcheckout < Struct.new(:arg)
     end
 
     def checkout_pull_request_branch(url)
+      puts "handling Pull Request URL..."
       out = `hub checkout #{url}`
       return false if out == ''
       out.scan(/Branch (.+) set/).flatten.first
@@ -57,7 +61,8 @@ class GitPcheckout < Struct.new(:arg)
     end
 
     def handle_source_branch(branch_name_with_prefix)
-      handle_branch_name(substitute_prefix(branch_name_with_prefix)) &&
+      branch_name = substitute_prefix(branch_name_with_prefix)
+      handle_branch_name(branch_name)
       delete_branch(branch_name_with_prefix)
     end
 
@@ -66,6 +71,29 @@ class GitPcheckout < Struct.new(:arg)
     end
 
     def handle_branch_name(branch)
-      HandleBranch.(branch)
+      HandleBranch.new(branch).perform
     end
+
+    def dirty_branch?
+      status_lines = get_status_lines
+      return false if status_lines.empty?
+
+      if modified_deleted_renamed?(status_lines)
+        puts status_lines
+        true
+      end
+    end
+
+    def get_status_lines
+      `git status -s`.split("\n").map(&:lstrip)
+    end
+
+    def modified_deleted_renamed?(lines)
+      lines.any? { |line| line.match(/(^M|^D|^R)\s/) }
+    end
+
+    def errors
+      { dirty_branch: "Please, commit your changes or stash them before you can switch branches"}
+    end
+  end
 end

data/spec/git-pcheckout_spec.rb

@@ -1,60 +1,68 @@
-require_relative '../git-pcheckout.rb'
+require 'spec_helper'
 
-describe GitPcheckout do
+describe GitPcheckout::Base do
+  before do
+    allow_any_instance_of(described_class).to receive(:system).and_return(true)
 
-  context ".call" do
-    it "should delegate to #new() with all params" do
-      expect_any_instance_of(described_class).to receive("call").and_return(true)
-      instance = described_class.("foo")
-      expect(instance).to be
-    end
-
-    it "should send #call() to created instance" do
-      expect_any_instance_of(described_class).to receive("call")
-      described_class.("foo")
-    end
+    handle_branch = double(:handle_branch, perform: 'handle_branch')
+    HandleBranch.stub(:new).and_return(handle_branch)
   end
 
-  context "#initialize" do
-    it "should set @arg" do
-      instance = described_class.new("foo")
-      expect(instance.arg).to eql("foo")
+  context '#perofrm' do
+    it 'doesn\'t run if current branch is dirty' do
+      instance = described_class.new('foo')
+      instance.stub(:dirty_branch?).and_return(true)
+      expect { instance.perform }.to raise_error(SystemExit)
     end
-  end
 
-  context "#call" do
-    context "plain branch name" do
-      it "should handle plain branch name" do
-        expect_any_instance_of(described_class).to receive("pull_request_url?").and_return(false)
-        expect_any_instance_of(HandleBranch).to receive("call").and_return(true)
-        described_class.("foo")
+    context 'plain branch name' do
+      it 'handles plain branch name' do
+        instance = described_class.new('foo')
+        instance.stub(:dirty_branch?).and_return(false)
+
+        expect(instance.perform).to eql('handle_branch')
       end
     end
 
-    context "pull request url" do
-      it "should handle pull_request_url" do
-        expect_any_instance_of(described_class).to receive("handle_pull_request_url").and_return(true)
-        described_class.("https://github.com/user/repo.git")
+    context 'pull request URL' do
+      let(:origin_url)       { "git@github.com/#{user_name}/repo-name.git" }
+      let(:pull_request_url) { "https://github.com/#{user_name}/repo-name/pull/18" }
+      let(:branch_name)      { "#{user_name}-branch-name" }
+      let(:instance)         { described_class.new(pull_request_url) }
+
+      before do
+        instance.stub(:dirty_branch?).and_return(false)
+        instance.stub(:origin_url).and_return(origin_url)
+        instance.stub(:checkout_pull_request_branch).and_return(branch_name)
       end
 
-      it "should pull branch with prefix" do
-        origin_url = "git@github.com/user/repo-name.git"
-        url        = "https://github.com/forked-user/repo-name/pull/18"
-        expect_any_instance_of(described_class).to receive("origin_url").and_return(origin_url)
-        expect_any_instance_of(described_class).to receive("checkout_pull_request_branch").and_return("forked-user-branch_name")
-        described_class.(url)
+      context 'when pull request is from the same repo' do
+        let(:user_name) { 'user' }
+
+        it 'gets plain branch name out of pull request' do
+          expect(instance).to receive(:substitute_prefix)
+          instance.perform
+        end
+
+        it 'handles plain branch name' do
+          expect(instance).to receive(:handle_branch_name)
+          instance.perform
+        end
+
+        it 'deletes temporary branch' do
+          expect(instance).to receive(:delete_branch).with(branch_name)
+          instance.perform
+        end
       end
 
-      it "should handle a source branch, specified in pull request" do
-        origin_url = "git@github.com/user/repo-name.git"
-        url        = "https://github.com/user/repo-name/pull/18"
-        expect_any_instance_of(described_class).to receive("origin_url").twice.and_return(origin_url)
-        expect_any_instance_of(described_class).to receive("checkout_pull_request_branch").and_return("user-branch_name")
-        expect(HandleBranch).to receive("call").with("branch_name").and_return(true)
-        expect_any_instance_of(described_class).to receive("delete_branch").and_return(true)
-        described_class.(url)
+      context 'when pull request is from the fork' do
+        let(:user_name) { 'forked-user' }
+
+        it 'creates branch locally with fork prefix' do
+          expect(instance).to receive(:checkout_pull_request_branch)
+          instance.perform
+        end
       end
     end
-
   end
 end

data/spec/lib/handle_branch_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe HandleBranch do
+  let(:handle_branch) { described_class.new('foo') }
+
+  context '#perform' do
+    it 'checkouts and pulls if branch exists' do
+      handle_branch.stub('branch_exists_locally?').and_return(true)
+
+      expect(handle_branch).to receive('checkout_local_branch').and_return(true)
+      expect(handle_branch).to receive('pull_from_origin').and_return(true)
+
+      handle_branch.perform
+    end
+
+   it 'fetches and checkouts with track if branch not exist' do
+     handle_branch.stub('branch_exists_locally?').and_return(false)
+
+     expect(handle_branch).to receive('fetch_from_origin').and_return(true)
+     expect(handle_branch).to receive('checkout_and_track_branch').and_return(true)
+
+     handle_branch.perform
+   end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,11 @@
+require 'rubygems'
+require 'bundler/setup'
+
+Bundler.require
+
+RSpec.configure do |config|
+  config.treat_symbols_as_metadata_keys_with_true_values = true
+  config.run_all_when_everything_filtered = true
+  config.filter_run :focus
+  config.order = 'random'
+end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: git-pcheckout
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Vladimir Rybas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-23 00:00:00.000000000 Z
+date: 2014-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
 - !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: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Git command to evenly checkout local/remote branches and source/fork
@@ -61,7 +61,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
+- ".rspec"
 - Gemfile
 - Guardfile
 - LICENSE.txt
@@ -69,11 +70,13 @@ files:
 - Rakefile
 - bin/git-pcheckout
 - git-pcheckout.gemspec
-- git-pcheckout.rb
+- git-pcheckout.gemspec.lock
+- lib/git-pcheckout.rb
+- lib/git-pcheckout/handle_branch.rb
 - lib/git-pcheckout/version.rb
-- lib/handle-branch.rb
 - spec/git-pcheckout_spec.rb
-- spec/lib/handle-branch_spec.rb
+- spec/lib/handle_branch_spec.rb
+- spec/spec_helper.rb
 - tmp/.keep
 homepage: https://github.com/vrybas/git-pcheckout
 licenses:
@@ -85,12 +88,12 @@ 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'
 requirements: []
@@ -102,4 +105,5 @@ summary: Git command to evenly checkout local/remote branches and source/fork pu
   requests by URL (with Hub)
 test_files:
 - spec/git-pcheckout_spec.rb
-- spec/lib/handle-branch_spec.rb
+- spec/lib/handle_branch_spec.rb
+- spec/spec_helper.rb

data/spec/lib/handle-branch_spec.rb

@@ -1,40 +0,0 @@
-require_relative '../../lib/handle-branch.rb'
-
-describe HandleBranch do
-
-  context ".call" do
-    it "should delegate to #new() with all params" do
-      expect_any_instance_of(HandleBranch).to receive("call").and_return(true)
-      instance = HandleBranch.("foo")
-      expect(instance).to be
-    end
-
-    it "should send #call() to created instance" do
-      expect_any_instance_of(HandleBranch).to receive("call")
-      HandleBranch.("foo")
-    end
-  end
-
-  context "#initialize" do
-    it "should set @branch" do
-      instance = HandleBranch.new("foo")
-      expect(instance.branch).to eql("foo")
-    end
-  end
-
-  context "#call" do
-      it "should checkout and pull if branch exists" do
-        expect_any_instance_of(HandleBranch).to receive("branch_exists_locally?").and_return(true)
-        expect_any_instance_of(HandleBranch).to receive("checkout_local_branch").and_return(true)
-        expect_any_instance_of(HandleBranch).to receive("pull_from_origin").and_return(true)
-        HandleBranch.("foo")
-      end
-
-      it "should fetch and checkout with track if branch not exist" do
-        expect_any_instance_of(HandleBranch).to receive("branch_exists_locally?").and_return(false)
-        expect_any_instance_of(HandleBranch).to receive("fetch_from_origin").and_return(true)
-        expect_any_instance_of(HandleBranch).to receive("checkout_and_track_branch").and_return(true)
-        HandleBranch.("foo")
-      end
-  end
-end