loca 0.0.1 → 0.1.0

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: loca
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - smoll
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-08 00:00:00.000000000 Z
+date: 2015-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: addressable
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 2.3.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 2.3.7
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
@@ -53,109 +53,123 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.0.1
 - !ruby/object:Gem::Dependency
-  name: addressable
+  name: require_all
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.7
+        version: 1.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.7
+        version: 1.3.2
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.4'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 10.4.2
+        version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.4'
-    - - ">="
+        version: '1.7'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.4.2
+        version: 0.7.9
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.9
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.29.0
+        version: 0.4.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.29.0
+        version: 0.4.6
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '10.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 10.4.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '10.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 10.4.2
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.9
+        version: 3.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.9
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.6
+        version: 0.30.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.6
+        version: 0.30.1
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -182,15 +196,21 @@ files:
 - lib/loca.rb
 - lib/loca/cli.rb
 - lib/loca/error.rb
-- lib/loca/git.rb
-- lib/loca/url.rb
+- lib/loca/git/branch_creator.rb
+- lib/loca/git/branch_deleter.rb
+- lib/loca/git/common.rb
+- lib/loca/url/parser.rb
+- lib/loca/url/validator.rb
+- lib/loca/utils.rb
 - lib/loca/version.rb
-- spec/e2e/github_spec.rb
 - spec/loca/cli_spec.rb
-- spec/loca/git_spec.rb
-- spec/loca/url_spec.rb
+- spec/loca/git/branch_creator_spec.rb
+- spec/loca/git/common_spec.rb
+- spec/loca/url/parser_spec.rb
+- spec/loca/url/validator_spec.rb
+- spec/loca/utils_spec.rb
 - spec/spec_helper.rb
-- spec/support/features/github_helper.rb
+- spec/support/matchers/terminate.rb
 homepage: https://github.com/smoll/loca
 licenses:
 - MIT
@@ -216,9 +236,11 @@ signing_key:
 specification_version: 4
 summary: CLI for checking out GitHub Pull Requests locally
 test_files:
-- spec/e2e/github_spec.rb
 - spec/loca/cli_spec.rb
-- spec/loca/git_spec.rb
-- spec/loca/url_spec.rb
+- spec/loca/git/branch_creator_spec.rb
+- spec/loca/git/common_spec.rb
+- spec/loca/url/parser_spec.rb
+- spec/loca/url/validator_spec.rb
+- spec/loca/utils_spec.rb
 - spec/spec_helper.rb
-- spec/support/features/github_helper.rb
+- spec/support/matchers/terminate.rb

data/lib/loca/git.rb

@@ -1,117 +0,0 @@
-module Loca
-  class Git
-    include Thor::Actions
-
-    attr_reader :branch_name
-
-    def initialize(url, remote = nil)
-      @url = Loca::URL.new(url)
-      @branch_name = @url.branch_name
-
-      ensure_git_repo
-      ensure_no_unstashed_files
-      @remote_name = remote || extract_remote_name
-    end
-
-    def delete
-      # Cannot delete a branch you are currently on:
-      checkout_another_branch if @branch_name == current_branch
-      git "branch -D #{@branch_name}"
-    end
-
-    def checkout
-      git "checkout #{@branch_name}", false # prints to stderr for some reason
-    end
-
-    def fetch
-      # To avoid fatal error: Refusing to fetch into current branch
-      delete unless first_time_creating?
-      # Performs `git fetch upstream pull/PR_NUMBER/head:BRANCH_NAME`
-      git "fetch #{@remote_name} pull/#{@url.pr_num}/head:#{@branch_name}", false # shellout has stderr for some reason
-    end
-
-    def first_time_creating? # Keep this a public method so we can prompt the user for overwrite
-      branches.include?(@branch_name) ? false : true
-    end
-
-    # Example
-    #
-    # git_match_http?("https://github.com/smoll/loca.git", "https://github.com/smoll/loca/pull/1")
-    # => true
-    def git_match_http?(git, http)
-      format = lambda do |uri| # Strip off uri scheme & trailing '.git'
-        uri.sub('https://', '')
-        .sub('http://', '')
-        .sub('git://', '')
-        .sub(/.git$/, '')
-      end
-      format.call(http).start_with?(format.call(git))
-    end
-
-    private
-
-    def git(cmd, fail_on_stderr = true)
-      shellout = Mixlib::ShellOut.new "git #{cmd}"
-      shellout.run_command
-      return shellout.stdout if shellout.stderr.empty?
-      if fail_on_stderr
-        fail Loca::Error::GitStdErrDetected, "#{shellout.stderr.strip}"
-      else
-        $stderr.puts shellout.stderr.strip.yellow
-      end
-      shellout.stdout.strip
-    end
-
-    def branches
-      git("for-each-ref refs/heads/ --format='%(refname:short)'").split("\n")
-    end
-
-    def current_branch
-      git('rev-parse --abbrev-ref HEAD').strip
-    end
-
-    def ensure_git_repo
-      git 'rev-parse'
-    end
-
-    def ensure_no_unstashed_files
-      val = git 'status --porcelain'
-      fail Loca::Error::UnstashedFilesFound, 'Commit or stash your files before continuing!' unless val.empty?
-    end
-
-    def checkout_another_branch
-      another = branches.find { |branch| branch != current_branch }
-      fail Loca::Error::OnlyOneBranch, 'No other branch to checkout!' unless another
-      git "checkout #{another}", false # prints to stderr for some reason
-    end
-
-    def remote_mapping
-      names = git('remote show -n').split("\n")
-      mapping = {}
-      names.each do |name|
-        mapping[name] = git("config --get remote.#{name}.url").strip
-      end
-      mapping
-    end
-
-    def extract_remote_name
-      match = remote_mapping.find { |_name, url| git_match_http?(url, @url.to_s) }
-      unless match
-        if yes?("Remote #{(@url)} not set. Would you like to set it as 'auto_loca_remote'?")
-          set_remote
-        else
-          fail Loca::Error::RemoteNotSet, "You must set the repo (#{@url}) as a remote "\
-          "(see `git remote -v'). All remotes: #{remote_mapping}"
-        end
-      end
-      match.first
-    end
-
-    def set_remote
-      uri = Addressable::URI.parse(@url)
-      uri.path = uri.path.split('/')[0..2].join('/')
-      remote_url = "#{uri}.git"
-      git "remote add upstream #{remote_url}"
-    end
-  end
-end

data/lib/loca/url.rb

@@ -1,37 +0,0 @@
-module Loca
-  class URL
-    attr_reader :branch_name
-    attr_reader :pr_num
-
-    def initialize(url)
-      @url = url
-      ensure_well_formed
-
-      @branch_name = extract_branch_name
-      @pr_num = extract_pr_num
-    end
-
-    def to_s
-      @url
-    end
-
-    def ensure_well_formed
-      # TODO: add more checks via Addressable::URI
-      segments = URI(@url).path.split('/')
-      int = Integer(segments[-1]) rescue false # replace with coercible gem?
-      pull = segments[-2] == 'pull'
-
-      fail Loca::Error::InvalidURL, "Doesn't appear to be a well-formed URL: #{@url}" unless int && pull
-    end
-
-    private
-
-    def extract_branch_name
-      "PULL_#{extract_pr_num}"
-    end
-
-    def extract_pr_num
-      URI(@url).path.split('/').last
-    end
-  end
-end

data/spec/e2e/github_spec.rb

@@ -1,43 +0,0 @@
-describe 'Checking out a GitHub PR locally' do
-  let(:pr_url) { 'https://github.com/octocat/Spoon-Knife/pull/4865' }
-  let(:expected_branch_name) { 'PULL_4865' }
-
-  before(:each) do
-    clone_test_repo
-    cd_to_cloned_dir
-  end
-
-  after(:each) { teardown }
-
-  context "the repo exists as the 'upstream' remote" do
-    before(:each)  { set_upstream }
-
-    it 'checks out then deletes' do
-      shellout! "loca c #{pr_url}"
-      expect(current_branch.strip).to eq expected_branch_name
-      shellout! "loca c #{pr_url} -d"
-      expect(current_branch.strip).to_not eq expected_branch_name
-    end
-
-    it 'checks out then prompts to overwrite' do
-      shellout! "loca c #{pr_url}"
-      expect(current_branch.strip).to eq expected_branch_name
-      shellout! "loca c #{pr_url}", input: 'yes'
-      expect(current_branch.strip).to eq expected_branch_name
-    end
-  end
-
-  context 'the repo does not exist as a remote' do
-    it 'fails to checkout' do
-      expect { shellout! "loca c #{pr_url}" }.to raise_error
-      expect(current_branch.strip).to_not eq expected_branch_name
-    end
-  end
-
-  context 'the wrong URL is supplied' do
-    it 'fails to checkout' do
-      expect { shellout! 'loca c https://github.com/octocat/Spoon-Knife/wrong/4865' }.to raise_error
-      expect(current_branch.strip).to_not eq expected_branch_name
-    end
-  end
-end

data/spec/loca/git_spec.rb

@@ -1,152 +0,0 @@
-describe Loca::Git do
-  let(:pid) { 1 } # Pull request ID
-  let(:url) { "https://github.com/smoll/loca/pull/#{pid}" }
-  let(:remote_name) { 'loca-fake-remote' }
-  let(:remote_url) { 'https://github.com/smoll/loca.git' }
-  subject { described_class.new(url, remote_name) }
-
-  let(:expected_branch_name) { "PULL_#{pid}" }
-  let(:branches_without_expected) { ['master'] }
-  let(:branches_with_expected) { branches_without_expected << expected_branch_name }
-
-  describe '#git' do # private method that shells out to git
-    it 'raises an error when an invalid git command is supplied' do
-      expect { capture(:stderr) { subject.send(:git, 'not-a-git-command') } }.to raise_error
-    end
-
-    it 'prints to stderr when an invalid git command is supplied, but we do not want to fail on stderr' do
-      output = capture(:stderr) { subject.send(:git, 'not-a-git-command', false) }
-      expect(output).to include "git: 'not-a-git-command' is not a git command"
-    end
-  end
-
-  describe '#branches' do # private method
-    it 'returns all local branches' do
-      cmd = "for-each-ref refs/heads/ --format='%(refname:short)'"
-      expect(subject).to receive(:git).with(cmd).and_return 'a_branch'
-      expect(subject.send(:branches)).to eq ['a_branch']
-    end
-  end
-
-  describe '#remote_mapping' do # private method
-    it "returns all of the repo's remotes" do
-      expect(subject).to receive(:git).with('remote show -n').and_return remote_name
-      expect(subject).to receive(:git).with("config --get remote.#{remote_name}.url").and_return remote_url
-      expect(subject.send(:remote_mapping)).to eq(remote_name => remote_url)
-    end
-  end
-
-  describe '#extract_remote_name' do # private method
-    it 'returns the local repo remote name corresponding to the Pull Request URL' do
-      expect(subject).to receive(:remote_mapping).and_return(remote_name => remote_url) # investigate this
-
-      expect(subject.send(:extract_remote_name)).to eq remote_name
-    end
-  end
-
-  describe '#current_branch' do # private method
-    it 'returns the current branch' do
-      expect(subject).to receive(:git).with('rev-parse --abbrev-ref HEAD').and_return "branch_name\n"
-      expect(subject.send(:current_branch)).to eq 'branch_name'
-    end
-  end
-
-  describe '#checkout' do # private method
-    it 'checks out the expected branch' do
-      expect(subject).to receive(:git).with("checkout #{expected_branch_name}", false).once
-      subject.send(:checkout)
-    end
-  end
-
-  describe '#checkout_another_branch' do # private method
-    it 'checks out a branch that is not the current one' do
-      allow(subject).to receive(:branches).and_return %w(branch1 branch2)
-      allow(subject).to receive(:current_branch).and_return 'branch1'
-      expect(subject).to receive(:git).with('checkout branch2', false).once
-      silence(:stdout) { subject.send(:checkout_another_branch) }
-    end
-
-    it 'raises an error when there is no other branch to check out' do
-      allow(subject).to receive(:branches).and_return ['branch1']
-      allow(subject).to receive(:current_branch).and_return 'branch1'
-
-      expect { silence(:stderr) { subject.send(:checkout_another_branch) } }.to raise_error
-    end
-  end
-
-  describe '#fetch' do
-    before do
-      allow(subject).to receive(:git) # ensure we don't actually shell out to `git`
-    end
-
-    it 'deletes before fetching when the branch already exists' do
-      allow(subject).to receive(:branches).and_return branches_with_expected
-      expect(subject).to receive(:delete).once
-
-      subject.fetch
-    end
-
-    it 'fetches the remote pull request' do
-      allow(subject).to receive(:branches).and_return branches_without_expected
-
-      # Investigate why this git command prints to $stderr, i.e. we must pass false as the 2nd arg:
-      expect(subject).to receive(:git).with("fetch #{remote_name} pull/#{pid}/head:#{expected_branch_name}", false)
-
-      subject.fetch
-    end
-  end
-
-  describe '#delete' do # should attempt to delete a branch with name 'PULL_1'
-    it 'raises an error when the branch does not exist' do
-      allow(subject).to receive(:branches).and_return branches_without_expected
-      expect { silence(:stderr) { subject.delete } }.to raise_error
-    end
-
-    it 'deletes the branch when it exists' do
-      allow(subject).to receive(:branches).and_return branches_with_expected
-      allow(subject).to receive(:current_branch).and_return('master')
-      expect(subject).to receive(:git).with("branch -D #{expected_branch_name}").once
-
-      subject.delete
-    end
-
-    it 'checks out another branch if attempting to delete current branch' do
-      allow(subject).to receive(:branches).and_return branches_with_expected
-      allow(subject).to receive(:current_branch).and_return expected_branch_name
-
-      expect(subject).to receive(:checkout_another_branch).once
-      expect(subject).to receive(:git).with("branch -D #{expected_branch_name}").once
-
-      subject.delete
-    end
-  end
-
-  describe '#first_time_creating?' do
-    it 'returns false when the branch already exists' do
-      allow(subject).to receive(:branches).and_return branches_with_expected
-      expect(subject.first_time_creating?).to eq false
-    end
-
-    it 'returns true when the branch does not exist' do
-      allow(subject).to receive(:branches).and_return branches_without_expected
-      expect(subject.first_time_creating?).to eq true
-    end
-  end
-
-  describe '#git_match_http?' do
-    it 'returns true when matching urls are supplied' do
-      git_url = 'https://github.com/smoll/loca.git'
-      expect(subject.git_match_http?(git_url, url)).to eq true
-    end
-
-    it 'returns true when different URI schemes but matching urls are supplied' do
-      git_url = 'git://github.com/smoll/loca.git'
-      expect(subject.git_match_http?(git_url, url)).to eq true
-    end
-
-    it 'returns false when non-matching urls are supplied' do
-      git_url = 'git://github.com/someoneelse/loca.git'
-      expect(subject.git_match_http?(git_url, url)).to eq false
-    end
-  end
-end