octokom 0.0.2 → 0.0.3

data/spec/octokom/shell_spec.rb

@@ -0,0 +1,54 @@
+require 'spec_helper'
+
+class Cli
+  include Octokom::Shell
+end
+
+describe Octokom::Shell do
+  let(:stdout) { double }
+
+  subject(:cli) { Cli.new }
+
+  before do
+    allow(cli).to receive(:puts) do |msg|
+      stdout.puts(msg)
+    end
+
+    allow(cli).to receive(:print) do |msg|
+      stdout.print(msg)
+    end
+  end
+
+  describe '.info' do
+    it 'prints a message' do
+      expect(stdout).to receive(:puts).with('Info    Test')
+      cli.info('Test')
+    end
+  end
+
+  describe '.error' do
+    it 'prints a message and returns with an error code' do
+      expect(stdout).to receive(:puts).with('Error   Test')
+      expect { cli.error('Test') }.to raise_error(SystemExit)
+    end
+  end
+
+  describe '.task' do
+    before do
+      allow(stdout).to receive(:print)
+      allow(stdout).to receive(:puts)
+    end
+
+    it 'updates a message' do
+      expect(stdout).to receive(:print).with('Waiting Test')
+      expect(stdout).to receive(:print).with("\r")
+      expect(stdout).to receive(:print).with('Done    Test')
+      expect(stdout).to receive(:puts).with(nil)
+      cli.task('Test') { 'Ok' }
+    end
+
+    it 'executes a task' do
+      expect { |block| cli.task('Test', &block) }.to yield_with_no_args
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -2,4 +2,10 @@ lib = File.expand_path('../../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 require 'octokom'
-require 'rspec/autorun'
+require 'rspec'
+
+ENV['HOME'] = './spec/support'
+
+def load_example(file_name)
+  open("#{ENV['HOME']}/#{file_name}.txt", &:read)
+end

data/spec/support/OCTOKOM-123

@@ -0,0 +1,11 @@
+# Please enter a title and optional a description below
+# the comments. To continue, save end close the file.
+# Comment lines starting with '#' will be ignored.
+
+# Title
+Chunky Bacon
+
+# Description
+Really
+ # comment
+    remarkable!

data/spec/support/git_branch_no_pending_commits.txt

@@ -0,0 +1,5 @@
+  master                  fc7af5e [origin/master] Test 1
+* test-1                  38d59ea Test 3
+  remotes/origin/HEAD     -> origin/master
+  remotes/origin/master   fc7af5e Test 1
+  remotes/origin/test-1   38d59ea Test 3

data/spec/support/git_branch_no_remote.txt

@@ -0,0 +1,5 @@
+  master                 5b09cf7 [origin/master] Initial commit
+* test-1                 8ece917 Test 1
+  remotes/origin/HEAD    -> origin/master
+  remotes/origin/feature e7ef9da Test
+  remotes/origin/master  5b09cf7 Initial commit

data/spec/support/git_branch_pending_commits.txt

@@ -0,0 +1,5 @@
+  master                 5b09cf7 [origin/master] Initial commit
+* test-1                 8ece917 Test 1
+  remotes/origin/HEAD    -> origin/master
+  remotes/origin/test-1  e7ef9da Test
+  remotes/origin/master  5b09cf7 Initial commit

data/spec/support/git_log_commits.txt

@@ -0,0 +1 @@
+aec653e Add all the features

metadata

@@ -1,115 +1,126 @@
 --- !ruby/object:Gem::Specification
 name: octokom
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Martin Jagusch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-14 00:00:00.000000000 Z
+date: 2014-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.6.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.6.3
 - !ruby/object:Gem::Dependency
-  name: octokit
+  name: netrc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0.rc2
+        version: 0.7.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0.rc2
+        version: 0.7.7
 - !ruby/object:Gem::Dependency
-  name: security
+  name: octokit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 2.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 2.7.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.1.0
+        version: 10.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.1.0
+        version: 10.1.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: 3.0.0.beta2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.1
-description: Command line application for your every day GitHub workflow.
+        version: 3.0.0.beta2
+description: GitHub For Your Command Line
 email: _@mj.io
 executables:
 - octokom
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/octokom
 - lib/octokom.rb
-- lib/octokom/authentication.rb
+- lib/octokom/cli.rb
+- lib/octokom/client.rb
 - lib/octokom/command.rb
+- lib/octokom/command/issue.rb
 - lib/octokom/command/pull_request.rb
-- lib/octokom/keychain.rb
+- lib/octokom/core_ext/blank.rb
+- lib/octokom/editor.rb
 - lib/octokom/repository.rb
+- lib/octokom/shell.rb
 - lib/octokom/version.rb
 - octokom.gemspec
-- spec/octokom/authentication_spec.rb
+- spec/octokom/cli_spec.rb
+- spec/octokom/client_spec.rb
+- spec/octokom/command/issue_spec.rb
 - spec/octokom/command/pull_request_spec.rb
 - spec/octokom/command_spec.rb
-- spec/octokom/keychain_spec.rb
+- spec/octokom/editor_spec.rb
 - spec/octokom/repository_spec.rb
-- spec/octokom_spec.rb
+- spec/octokom/shell_spec.rb
 - spec/spec_helper.rb
+- spec/support/OCTOKOM-123
+- spec/support/git_branch_no_pending_commits.txt
+- spec/support/git_branch_no_remote.txt
+- spec/support/git_branch_pending_commits.txt
+- spec/support/git_log_commits.txt
 homepage: https://github.com/mjio/octokom
 licenses:
 - MIT
@@ -120,26 +131,32 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
-summary: octokom-0.0.2
+summary: octokom-0.0.3
 test_files:
-- spec/octokom/authentication_spec.rb
+- spec/octokom/cli_spec.rb
+- spec/octokom/client_spec.rb
+- spec/octokom/command/issue_spec.rb
 - spec/octokom/command/pull_request_spec.rb
 - spec/octokom/command_spec.rb
-- spec/octokom/keychain_spec.rb
+- spec/octokom/editor_spec.rb
 - spec/octokom/repository_spec.rb
-- spec/octokom_spec.rb
+- spec/octokom/shell_spec.rb
 - spec/spec_helper.rb
-has_rdoc: 
+- spec/support/OCTOKOM-123
+- spec/support/git_branch_no_pending_commits.txt
+- spec/support/git_branch_no_remote.txt
+- spec/support/git_branch_pending_commits.txt
+- spec/support/git_log_commits.txt

data/lib/octokom/authentication.rb

@@ -1,42 +0,0 @@
-require 'io/console'
-
-module Octokom
-  module Authentication
-    OCTOKIT_ERRORS = [
-      Octokit::BadRequest,
-      Octokit::Unauthorized,
-      Octokit::Forbidden,
-      Octokit::NotFound,
-      Octokit::NotAcceptable,
-      Octokit::UnprocessableEntity,
-      Octokit::InternalServerError,
-      Octokit::NotImplemented,
-      Octokit::BadGateway,
-      Octokit::ServiceUnavailable
-    ]
-
-    def authenticate(&block)
-      begin
-        yield Octokit::Client.new(login: login, password: password)
-      rescue *OCTOKIT_ERRORS => e
-        puts "Unable to authenticate user '#{login}' (#{e.class})"
-        # TODO print message about how to reenter credentials
-        # TODO use custom method instead of puts
-      end
-    end
-
-    private
-
-    def login
-      keychain[:login]
-    end
-
-    def password
-      keychain[:password]
-    end
-
-    def keychain
-      Octokom::Keychain.create
-    end
-  end
-end

data/lib/octokom/keychain.rb

@@ -1,54 +0,0 @@
-module Octokom
-  class Keychain
-    def self.create
-      new.find_or_create_keychain
-    end
-
-    def find_or_create_keychain
-      if keychain
-        {login: keychain.attributes['acct'], password: keychain.password}
-      else
-        create_octokom_keychain
-        find_or_create_keychain
-      end
-    end
-
-    private
-
-    def keychain
-      # TODO make sure this happens only once
-      @keychain ||= octokom_keychain || github_keychain
-    end
-
-    def octokom_keychain
-      Security::GenericPassword.find(service: 'octokom')
-    end
-
-    def github_keychain
-      Security::InternetPassword.find(server: 'github.com')
-    end
-
-    def create_octokom_keychain
-      login = ask_for_login
-      password = ask_for_password
-
-      puts
-
-      save_octokom_keychain(login, password)
-    end
-
-    def ask_for_login
-      print 'GitHub Login: '
-      STDIN.gets.chomp
-    end
-
-    def ask_for_password
-      print 'Password: '
-      STDIN.noecho(&:gets).chomp
-    end
-
-    def save_octokom_keychain(login, password)
-      Security::GenericPassword.add('octokom', login, password)
-    end
-  end
-end

data/spec/octokom/authentication_spec.rb

@@ -1,25 +0,0 @@
-require 'spec_helper'
-
-class Cmd
-  include Octokom::Authentication
-end
-
-describe Octokom::Authentication do
-  let(:cmd)      { Cmd.new }
-  let(:keychain) { {login: 'fox', password: 'bacon'} }
-
-  before do
-    allow(cmd).to receive(:keychain) { keychain }
-  end
-
-  it 'authenticates the user' do
-    credentials = {login: 'fox', password: 'bacon'}
-    expect(Octokit::Client).to receive(:new).with(credentials)
-    cmd.authenticate { }
-  end
-
-  it 'handels exceptions' do
-    expect(STDOUT).to receive(:puts).with(/Unable to authenticate/)
-    cmd.authenticate { raise Octokit::Unauthorized }
-  end
-end

data/spec/octokom/keychain_spec.rb

@@ -1,45 +0,0 @@
-require 'spec_helper'
-
-describe Octokom::Keychain do
-  let(:keychain) { double(attributes: {'acct' => 'fox'}, password: 'bacon') }
-
-  before do
-    allow(Security::GenericPassword).to receive(:find) { nil }
-    allow(Security::GenericPassword).to receive(:add) { nil }
-    allow(Security::InternetPassword).to receive(:find) { nil }
-  end
-
-  context 'using existing `octokom` keychain' do
-    before do
-      allow(Security::GenericPassword).to receive(:find).with(service: 'octokom') { keychain }
-    end
-
-    it 'finds the keychain' do
-      expect(Octokom::Keychain.create).to eq(login: 'fox', password: 'bacon')
-    end
-  end
-
-  context 'using existing `github` keychain' do
-    before do
-      allow(Security::InternetPassword).to receive(:find).with(server: 'github.com') { keychain }
-    end
-
-    it 'finds the keychain' do
-      expect(Octokom::Keychain.create).to eq(login: 'fox', password: 'bacon')
-    end
-  end
-
-  context 'creating new `github` keychain' do
-    before do
-      Octokom::Keychain.any_instance.stub(:ask_for_login).and_return('fox')
-      Octokom::Keychain.any_instance.stub(:ask_for_password).and_return('bacon')
-      allow(STDOUT).to receive(:puts)
-    end
-
-    it 'saves a keychain' do
-      pending 'prevent retry'
-      expect(Security::GenericPassword).to receive(:add).with('octokom', 'fox', 'bacon')
-      Octokom::Keychain.create
-    end
-  end
-end