octokom 0.0.2 → 0.0.3

data/lib/octokom/repository.rb

@@ -1,29 +1,64 @@
 module Octokom
   class Repository
-    class << self
-      def remote_path
-        remote_url[/(\w+\/(\w+|\.)+)\.git$/, 1]
-      end
-
-      def current_branch
-        `git rev-parse --abbrev-ref HEAD`.chomp
-      end
-
-      def unpushed_commits?
-        !count_unpushed_commits.zero?
-      end
-
-      def count_unpushed_commits
-        cmd = 'git log --branches --not --remotes --format=oneline'
-        `#{cmd}`.chomp.split('\n').count
-      end
-
-      private
-
-      def remote_url
-        # TODO make "origin" configurable
-        `git config --get remote.origin.url`.chomp
-      end
+    include Octokom::Shell
+
+    def initialize(verbose)
+      @verbose = verbose
+    end
+
+    def repo_path
+      error('Git remote not defined') if remote_url.blank?
+      path = remote_url.split('/')[-2..-1]
+      path.join('/')[/(.*)\.git$/, 1]
+    end
+
+    def toplevel_path
+      git('rev-parse --show-toplevel')
+    end
+
+    # TODO Make base branch configurable.
+    def base_branch
+      'master'
+    end
+
+    def head_branch
+      git('rev-parse --abbrev-ref HEAD')
+    end
+
+    def pending_commits?
+      current_sha1 = last_commits[/^\*\s((\w|-|_)*)\s+(\w{7})/, 3]
+      remote_sha1 = last_commits[/remotes\/origin\/#{head_branch}\s+(\w{7})/, 1]
+
+      return true if remote_sha1.blank?
+      current_sha1 != remote_sha1 ? true : false
+    end
+
+    def last_commit_message
+      git('log -1 --oneline')[/^\w+\s(.*)$/, 1]
+    end
+
+    def push(branch)
+      git("push origin #{branch}")
+    end
+
+    private
+
+    # TODO Make origin configurable.
+    def remote_url
+      @remote_url ||= git('config --get remote.origin.url')
+    end
+
+    def last_commits
+      @last_commits ||= git('branch -avvv')
+    end
+
+    def verbose?
+      !!@verbose
+    end
+
+    def git(cmd)
+      puts "git #{cmd}" if verbose?
+      `git #{cmd}`.chomp
     end
   end
 end

data/lib/octokom/shell.rb

@@ -0,0 +1,22 @@
+module Octokom
+  module Shell
+    def info(message)
+      puts "Info    #{message}"
+    end
+
+    def error(message)
+      puts "Error   #{message}"
+      exit(1)
+    end
+
+    # Print a waiting message before a long running task and replace
+    # the message as soon as the task has finished.
+    def task(message)
+      print "Waiting #{message}"
+      yield
+      print "\r"
+      print "Done    #{message}"
+      puts
+    end
+  end
+end

data/lib/octokom/version.rb

@@ -1,3 +1,3 @@
 module Octokom
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/octokom.gemspec

@@ -8,20 +8,22 @@ Gem::Specification.new do |gem|
   gem.version       = Octokom::VERSION
   gem.authors       = 'Martin Jagusch'
   gem.email         = '_@mj.io'
-  gem.description   = 'Command line application for your every day GitHub workflow.'
+  gem.description   = 'GitHub For Your Command Line'
   gem.summary       = "octokom-#{Octokom::VERSION}"
   gem.homepage      = 'https://github.com/mjio/octokom'
   gem.license       = 'MIT'
 
+  gem.required_ruby_version = '>= 1.9.3'
+
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}) { |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^spec/})
   gem.require_paths = ['lib']
 
-  gem.add_dependency 'clamp', '~> 0.6.1'
-  gem.add_dependency 'octokit', '2.0.0.rc2'
-  gem.add_dependency 'security', '~> 0.1.2'
+  gem.add_dependency 'clamp', '~> 0.6.3'
+  gem.add_dependency 'netrc', '~> 0.7.7'
+  gem.add_dependency 'octokit', '~> 2.7.1'
 
-  gem.add_development_dependency 'rake', '~> 10.1.0'
-  gem.add_development_dependency 'rspec', '~> 2.14.1'
+  gem.add_development_dependency 'rake', '~> 10.1.1'
+  gem.add_development_dependency 'rspec', '~> 3.0.0.beta2'
 end

data/spec/octokom/cli_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+describe Octokom::CLI do
+  it 'has a "issue" sub command' do
+    command = Octokom::CLI.find_subcommand('issue')
+    expect(command).to be_kind_of(Clamp::Subcommand::Definition)
+  end
+
+  it 'has a "pull-request" sub command' do
+    command = Octokom::CLI.find_subcommand('pull-request')
+    expect(command).to be_kind_of(Clamp::Subcommand::Definition)
+  end
+end

data/spec/octokom/client_spec.rb

@@ -0,0 +1,67 @@
+require 'spec_helper'
+require 'octokit'
+
+describe Octokom::Client do
+  let(:netrc) { {Octokom::Client::KEY => credentials} }
+
+  before do
+    allow(Netrc).to receive(:new) { netrc }
+  end
+
+  describe '#authenticate' do
+    context 'with valid netrc file' do
+      let(:credentials) { ['fox', 'chunky'] }
+
+      it 'parses the credentials' do
+        auth = Octokom::Client.authenticate
+        expect(auth.token).to eq('chunky')
+      end
+
+      it 'returns a client instance' do
+        auth = Octokom::Client.authenticate
+        expect(auth).to be_kind_of(Octokom::Client)
+      end
+
+      it 'handels invalid API tokens on GitHub'
+    end
+
+    context 'with invalid netrc file' do
+      let(:credentials) { [] }
+      let(:octokit)     { double }
+      let(:auth)        { double(:token => nil) }
+
+      before do
+        allow_any_instance_of(Octokom::Client).to receive(:ask_for_login) { 'fox' }
+        allow_any_instance_of(Octokom::Client).to receive(:ask_for_password) { 'bacon' }
+        allow(Octokit::Client).to receive(:new) { octokit }
+        allow(octokit).to receive(:create_authorization) { auth }
+        allow(netrc).to receive(:save) { true }
+        allow(STDOUT).to receive(:puts)
+      end
+
+      it 'initializes a new Octokit client' do
+        expect(Octokit::Client).to receive(:new).with(login: 'fox', password: 'bacon')
+        Octokom::Client.authenticate
+      end
+
+      it 'creates a authorization token' do
+        expect(octokit).to receive(:create_authorization)
+        Octokom::Client.authenticate
+      end
+
+      it 'creates a authorization token' do
+        expect(netrc).to receive(:save)
+        Octokom::Client.authenticate
+      end
+    end
+  end
+
+  describe '#client' do
+    let(:credentials) { ['fox', 'chunky'] }
+
+    it 'initializes a new Octokit client' do
+      auth = Octokom::Client.authenticate
+      expect(auth.client).to be_kind_of(Octokit::Client)
+    end
+  end
+end

data/spec/octokom/command/issue_spec.rb

@@ -0,0 +1,58 @@
+require 'spec_helper'
+require 'octokom/command/issue'
+
+describe Issue do
+  describe '#create' do
+    let(:git)    { double(repo_path: 'user/repo') }
+    let(:auth)   { double(client: client) }
+    let(:client) { double }
+
+    before do
+      allow(Octokom::Repository).to receive(:new) { git }
+      allow(Octokom::Client).to receive(:authenticate) { auth }
+      allow(client).to receive(:create_issue)
+      allow_any_instance_of(Octokom::Command).to receive(:print)
+      allow_any_instance_of(Octokom::Command).to receive(:puts)
+    end
+
+    subject(:cmd) { Issue.new('test') }
+
+    context 'when no "title" option is set' do
+      let(:options) { %w(create) }
+
+      it 'opens the editor' do
+        expect(Octokom::Editor).to receive(:open).with(git, nil, nil) { ['Bacon'] }
+
+        cmd.run(options)
+      end
+
+      it 'exits when no "title" can be parsed'
+    end
+
+    context 'when "title" option is set' do
+      let(:options) { %w(create --title Bacon) }
+
+      it 'creates a GitHub issue' do
+        expect(client).to receive(:create_issue).with('user/repo', 'Bacon', nil)
+
+        cmd.run(options)
+      end
+
+      context 'and "dry-run" tag is set' do
+        it 'does not create a GitHub issue' do
+          expect(client).to_not receive(:create_issue)
+
+          cmd.run(options.push('--dry-run'))
+        end
+      end
+
+      context 'and "editor" tag is set' do
+        it 'opens the editor' do
+          expect(Octokom::Editor).to receive(:open).with(git, 'Bacon', nil) { ['Bacon'] }
+
+          cmd.run(options.push('--editor'))
+        end
+      end
+    end
+  end
+end

data/spec/octokom/command/pull_request_spec.rb

@@ -1,8 +1,7 @@
 require 'spec_helper'
+require 'octokom/command/pull_request'
 
-describe Octokom::Command::PullRequest do
-  it 'has a `create` sub command' do
-    command = Octokom::Command::PullRequest.find_subcommand('create')
-    expect(command).to be_kind_of(Clamp::Subcommand::Definition)
+describe PullRequest do
+  describe '#create' do
   end
 end

data/spec/octokom/command_spec.rb

@@ -1,8 +1,61 @@
 require 'spec_helper'
 
 describe Octokom::Command do
-  it 'has a `pull-request` sub command' do
-    command = Octokom::Command.find_subcommand('pull-request')
-    expect(command).to be_kind_of(Clamp::Subcommand::Definition)
+  describe '#flag' do
+    subject(:cmd) do
+      class FlagCmd < Octokom::Command
+        flag ['--bacon'], 'Bacon'
+        execute { @bacon }
+      end
+
+      FlagCmd.new('test')
+    end
+
+    it 'returns true when the flag option is set' do
+      expect(cmd.run(['--bacon'])).to be(true)
+    end
+
+    it 'returns nil when the flag option is not set' do
+      expect(cmd.run([])).to be_nil
+    end
+  end
+
+  describe '#option' do
+    subject(:cmd) do
+      class OptionCmd < Octokom::Command
+        option ['--bacon'], 'Bacon'
+        execute { @bacon }
+      end
+
+      OptionCmd.new('test')
+    end
+
+    it 'returns the the option value' do
+      expect(cmd.run(['--bacon', '1'])).to eq('1')
+    end
+
+    it 'returns nil when the option is not set' do
+      expect(cmd.run([])).to be_nil
+    end
+  end
+
+  describe '#git' do
+    subject(:cmd) do
+      class GitCmd < Octokom::Command
+        execute { git }
+      end
+
+      GitCmd.new('test')
+    end
+
+    let(:git) { double }
+
+    before do
+      allow(Octokom::Repository).to receive(:new) { git }
+    end
+
+    it 'initializes a Repository instance' do
+      expect(cmd.run([])).to eq(git)
+    end
   end
 end

data/spec/octokom/editor_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+describe Octokom::Editor do
+  let(:repo)    { double(toplevel_path: '~') }
+  let(:title)   { 'Feature' }
+  let(:desc)    { '...' }
+  let(:editor)  { Octokom::Editor.new(repo, nil, nil) }
+
+  describe '#open_editor' do
+    before do
+      allow(editor).to receive(:editor_name) { 'vi' }
+    end
+
+    it 'build the command' do
+      expect(editor).to receive(:system).with(/^vi --nofork +6*+/)
+      editor.open_editor
+    end
+  end
+
+  describe '#parse_user_input' do
+    before do
+      allow(editor).to receive(:file_name) { './spec/support/OCTOKOM-123' }
+    end
+
+    it 'finds the title' do
+      expect(editor.parse_user_input[0]).to eq('Chunky Bacon')
+    end
+
+    it 'finds the description' do
+      expect(editor.parse_user_input[1]).to eq("Really\n    remarkable!")
+    end
+  end
+end

data/spec/octokom/repository_spec.rb

@@ -1,15 +1,72 @@
 require 'spec_helper'
 
 describe Octokom::Repository do
-  subject(:repo) { Octokom::Repository }
+  subject(:repo) { Octokom::Repository.new(false) }
 
-  describe '#remote_path' do
+  describe '#repo_path' do
+    context 'when a remote path is defined' do
+      before do
+        allow(repo).to receive(:remote_url) { 'https://github.com/fox-1/bacon.rb.git' }
+      end
+
+      it 'returns the GitHub repository path' do
+        expect(repo.repo_path).to eq('fox-1/bacon.rb')
+      end
+    end
+
+    context 'when no remote path is defined' do
+      let(:stdout) { double }
+
+      before do
+        allow(repo).to receive(:remote_url) { nil }
+        allow(stdout).to receive(:puts)
+        allow(repo).to receive(:puts) { |msg| stdout.puts(msg) }
+      end
+
+      it 'prints a error message and exits' do
+        expect(stdout).to receive(:puts).with(/Git remote not defined/)
+        expect { repo.repo_path }.to raise_error(SystemExit)
+      end
+    end
+  end
+
+  describe '#pending_commits?' do
+    before do
+      allow(repo).to receive(:head_branch) { 'test-1' }
+    end
+
+    context 'with pending commits' do
+      before do
+        allow(repo).to receive(:last_commits) { load_example(:git_branch_pending_commits) }
+      end
+
+      specify { expect(repo.pending_commits?).to be(true) }
+    end
+
+    context 'with no pending commits' do
+      before do
+        allow(repo).to receive(:last_commits) { load_example(:git_branch_no_pending_commits) }
+      end
+
+      specify { expect(repo.pending_commits?).to be(false) }
+    end
+
+    context 'with no remote branch' do
+      before do
+        allow(repo).to receive(:last_commits) { load_example(:git_branch_no_remote) }
+      end
+
+      specify { expect(repo.pending_commits?).to be(true) }
+    end
+  end
+
+  describe '#last_commit_message' do
     before do
-      allow(repo).to receive(:remote_url) { 'https://github.com/mjio/octokom.git' }
+      allow(repo).to receive(:git) { load_example(:git_log_commits) }
     end
 
-    it 'returns GitHub remote path' do
-      expect(repo.remote_path).to eq('mjio/octokom')
+    it 'returns the commit message' do
+      expect(repo.last_commit_message).to eq('Add all the features')
     end
   end
 end