github_cli 0.4.2 → 0.4.3

data/.travis.yml

@@ -1,17 +1,17 @@
 before_install:
   - gem install bundler
-branches:
-  only: master
-notifications:
-  email:false
 matrix:
   allow_failures:
     - rvm: ruby-head
-    - jruby
-    - rbx-19mode
+    - rvm: jruby-19mode
+    - rvm: rbx-19mode
 rvm:
   - 1.9.2
   - 1.9.3
   - rbx-19mode
-  - jruby
+  - jruby-19mode
   - ruby-head
+branches:
+  only: master
+notifications:
+  email:false

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+0.4.3 (July 14, 2012)
+
+* Add communist gem dependency.
+* Fix bug with getting blob data and add blob api feature tests.
+* Fix bug with getting commit data and add commit api feature tests.
+* Fix bug with removing collaborator and add feature tests.
+* Add content, download, email api commands feature tests.
+* Fix bug with missing event api inclusion and add feature tests.
+* Fix bug with checkig if user is a follower and add feature tests.
+* Fix bug with listing starred gists and add gist api feature tests.
+* Add hook api commands feature tests.
+* Fix bugs with labels api coammands using old github_api gem method calls.
+
 0.4.2 (July 12, 2012)
 
 * Add 'did you mean' help for mistyped commands.

data/Gemfile

@@ -1,3 +1,5 @@
 source 'https://rubygems.org'
 
+# gem 'communist', :path => '../communist'
+
 gemspec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    github_cli (0.4.2)
+    github_cli (0.4.3)
       github_api (~> 0.6)
       thor
 
@@ -16,6 +16,9 @@ GEM
     builder (3.0.0)
     childprocess (0.3.2)
       ffi (~> 1.0.6)
+    communist (0.1.0)
+      rack
+      sinatra
     cucumber (1.2.1)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
@@ -45,6 +48,8 @@ GEM
       multi_json (~> 1.0)
       rack (~> 1.4)
     rack (1.4.1)
+    rack-protection (1.2.0)
+      rack
     rake (0.9.2.2)
     rspec (2.10.0)
       rspec-core (~> 2.10.0)
@@ -54,13 +59,19 @@ GEM
     rspec-expectations (2.10.0)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.10.1)
+    sinatra (1.3.2)
+      rack (~> 1.3, >= 1.3.6)
+      rack-protection (~> 1.2)
+      tilt (~> 1.3, >= 1.3.3)
     thor (0.15.2)
+    tilt (1.3.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   aruba
+  communist
   github_cli!
   rake
   rspec

data/features/blob.feature

@@ -6,3 +6,19 @@ Feature: ghc blob
     Then the exit status should be 0
       And the output should contain "ghc blob get"
       And the output should contain "ghc blob create"
+
+  Scenario: Get blob
+    Given the GitHub API server:
+    """
+    get('/repos/wycats/thor/git/blobs/59b23de9b91d') { status 200 }
+    """
+    When I run `ghc blob get wycats thor 59b23de9b91d`
+    Then the exit status should be 0
+
+  Scenario: Create blob
+    Given the GitHub API server:
+    """
+    post('/repos/wycats/thor/git/blobs') { status 200 }
+    """
+    When I run `ghc blob create wycats thor --params=content:'Content' encoding:'utf-8'`
+    Then the exit status should be 0

data/features/collaborator.feature

@@ -8,3 +8,36 @@ Feature: ghc collab
       And the output should contain "ghc collab add"
       And the output should contain "ghc collab collab"
       And the output should contain "ghc collab remove"
+
+  Scenario: List collaborators
+    Given the GitHub API server:
+    """
+    get('/repos/wycats/thor/collaborators') { status 200 }
+    """
+    When I run `ghc collab ls wycats thor`
+    Then the exit status should be 0
+
+  Scenario: Add collaborator
+    Given the GitHub API server:
+    """
+    put('/repos/wycats/thor/collaborators/octocat') { status 200 }
+    """
+    When I run `ghc collab add wycats thor octocat`
+    Then the exit status should be 0
+
+  Scenario: Remove collaborator
+    Given the GitHub API server:
+    """
+    delete('/repos/wycats/thor/collaborators/octocat') { status 200 }
+    """
+    When I run `ghc collab remove wycats thor octocat`
+    Then the exit status should be 0
+
+  Scenario: Check if collaborator
+    Given the GitHub API server:
+    """
+    delete('/repos/wycats/thor/collaborators/octocat') { status 200 }
+    """
+    When I run `ghc collab collab wycats thor octocat`
+    Then the exit status should be 0
+

data/features/commit.feature

@@ -6,3 +6,19 @@ Feature: ghc commit
     Then the exit status should be 0
       And the output should contain "ghc commit get"
       And the output should contain "ghc commit create"
+
+  Scenario: Get commit
+    Given the GitHub API server:
+    """
+    get('/repos/wycats/thor/git/commits/59b23de9b91d') { status 200 }
+    """
+    When I run `ghc commit get wycats thor 59b23de9b91d`
+    Then the exit status should be 0
+
+  Scenario: Create commit
+    Given the GitHub API server:
+    """
+    post('/repos/wycats/thor/git/commits') { status 200 }
+    """
+    When I run `ghc commit create wycats thor --params=message:'my commit' tree:827efc parents:['7d1b31e']`
+    Then the exit status should be 0

data/features/content.feature

@@ -7,3 +7,35 @@ Feature: ghc content
       And the output should contain "ghc content get"
       And the output should contain "ghc content readme"
       And the output should contain "ghc content archive"
+
+  Scenario: Readme
+    Given the GitHub API server:
+    """
+    get('/repos/wycats/thor/readme') { status 200 }
+    """
+    When I run `ghc content readme wycats thor`
+    Then the exit status should be 0
+
+  Scenario: Get content
+    Given the GitHub API server:
+    """
+    get('/repos/wycats/thor/contents/lib') { status 200 }
+    """
+    When I run `ghc content get wycats thor lib`
+    Then the exit status should be 0
+
+  Scenario: Archive
+    Given the GitHub API server:
+    """
+    get('/repos/wycats/thor/zipball/master') { status 200 }
+    """
+    When I run `ghc content archive wycats thor`
+    Then the exit status should be 0
+
+  Scenario: Archive with params
+    Given the GitHub API server:
+    """
+    get('/repos/wycats/thor/tarball/new_feature') { status 200 }
+    """
+    When I run `ghc content archive wycats thor --params=archive_format:tarball ref:new_feature`
+    Then the exit status should be 0

data/features/download.feature

@@ -9,3 +9,35 @@ Feature: ghc download
       And the output should contain "ghc download get"
       And the output should contain "ghc download list"
       And the output should contain "ghc download upload"
+
+  Scenario: List downloads
+    Given the GitHub API server:
+    """
+    get('/repos/wycats/thor/downloads') { status 200 }
+    """
+    When I run `ghc download ls wycats thor`
+    Then the exit status should be 0
+
+  Scenario: Get download
+    Given the GitHub API server:
+    """
+    get('/repos/wycats/thor/downloads/1') { status 200 }
+    """
+    When I run `ghc download get wycats thor 1`
+    Then the exit status should be 0
+
+  Scenario: Delete download
+    Given the GitHub API server:
+    """
+    delete('/repos/wycats/thor/downloads/1') { status 200 }
+    """
+    When I run `ghc download delete wycats thor 1`
+    Then the exit status should be 0
+
+  Scenario: Create download
+    Given the GitHub API server:
+    """
+    post('/repos/wycats/thor/downloads') { status 200 }
+    """
+    When I run `ghc download create wycats thor --params=name:octo.jpg size:113410`
+    Then the exit status should be 0

data/features/email.feature

@@ -7,3 +7,27 @@ Feature: ghc email
       And the output should contain "ghc email delete"
       And the output should contain "ghc email list"
       And the output should contain "ghc email add"
+
+  Scenario: List emails
+    Given the GitHub API server:
+    """
+    get('/user/emails') { status 200 }
+    """
+    When I run `ghc email ls`
+    Then the exit status should be 0
+
+  Scenario: Add emails
+    Given the GitHub API server:
+    """
+    post('/user/emails') { status 200 }
+    """
+    When I run `ghc email add user@github.com`
+    Then the exit status should be 0
+
+  Scenario: Delete emails
+    Given the GitHub API server:
+    """
+    delete('/user/emails') { status 200 }
+    """
+    When I run `ghc email del user@github.com`
+    Then the exit status should be 0

data/features/errors.feature

@@ -1,10 +1,11 @@
 Feature: ghc errors notification
 
+  @wip
   Scenario: Unknown formatting option
 
-    When I run `ghc repo list -u wycats --format=unknown`
-    Then the exit status should be 1
-    And the output should contain:
-    """
-    Fatal error has occurred. Unrecognized formatting options: unknown
-    """
+#     When I run `ghc repo list -u wycats --format=unknown`
+#     Then the exit status should be 1
+#     And the output should contain:
+#     """
+#     Fatal error has occurred. Unrecognized formatting options: unknown
+#     """

data/features/event.feature

@@ -12,3 +12,83 @@ Feature: ghc event
       And the output should contain "ghc event received"
       And the output should contain "ghc event repo"
       And the output should contain "ghc event user_org"
+
+  Scenario: Public events
+    Given the GitHub API server:
+    """
+    get('/events') { status 200 }
+    """
+    When I run `ghc event public`
+    Then the exit status should be 0
+
+  Scenario: Repository events
+    Given the GitHub API server:
+    """
+    get('/repos/wycats/thor/events') { status 200 }
+    """
+    When I run `ghc event repo wycats thor`
+    Then the exit status should be 0
+
+  Scenario: Issue events
+    Given the GitHub API server:
+    """
+    get('/repos/wycats/thor/issues/events') { status 200 }
+    """
+    When I run `ghc event issue wycats thor`
+    Then the exit status should be 0
+
+  Scenario: Network events
+    Given the GitHub API server:
+    """
+    get('/networks/wycats/thor/events') { status 200 }
+    """
+    When I run `ghc event network wycats thor`
+    Then the exit status should be 0
+
+  Scenario: Organization events
+    Given the GitHub API server:
+    """
+    get('/orgs/github/events') { status 200 }
+    """
+    When I run `ghc event org github`
+    Then the exit status should be 0
+
+  Scenario: Received events
+    Given the GitHub API server:
+    """
+    get('/users/wycats/received_events') { status 200 }
+    """
+    When I run `ghc event received wycats`
+    Then the exit status should be 0
+
+  Scenario: Received public events
+    Given the GitHub API server:
+    """
+    get('/users/wycats/received_events/public') { status 200 }
+    """
+    When I run `ghc event received wycats --public`
+    Then the exit status should be 0
+
+  Scenario: Performed events
+    Given the GitHub API server:
+    """
+    get('/users/wycats/events') { status 200 }
+    """
+    When I run `ghc event performed wycats`
+    Then the exit status should be 0
+
+  Scenario: Performed public events
+    Given the GitHub API server:
+    """
+    get('/users/wycats/events/public') { status 200 }
+    """
+    When I run `ghc event performed wycats --public`
+    Then the exit status should be 0
+
+  Scenario: User organization events
+    Given the GitHub API server:
+    """
+    get('/users/wycats/events/orgs/rails') { status 200 }
+    """
+    When I run `ghc event user_org wycats rails`
+    Then the exit status should be 0

data/features/follower.feature

@@ -9,3 +9,51 @@ Feature: ghc follower
       And the output should contain "ghc follower following"
       And the output should contain "ghc follower list"
       And the output should contain "ghc follower unfollow"
+
+  Scenario: List for user
+    Given the GitHub API server:
+    """
+    get('/users/wycats/followers') { status 200 }
+    """
+    When I run `ghc follower ls -u wycats`
+    Then the exit status should be 0
+
+  Scenario: List for the authenticated user
+    Given the GitHub API server:
+    """
+    get('/user/followers') { status 200 }
+    """
+    When I run `ghc follower ls`
+    Then the exit status should be 0
+
+  Scenario: Follower
+    Given the GitHub API server:
+    """
+    get('/users/following/wycats') { status 200 }
+    """
+    When I run `ghc follower follower wycats`
+    Then the exit status should be 0
+
+  Scenario: Following
+    Given the GitHub API server:
+    """
+    get('/users/wycats/following') { status 200 }
+    """
+    When I run `ghc follower following -u wycats`
+    Then the exit status should be 0
+
+  Scenario: Follow
+    Given the GitHub API server:
+    """
+    put('/user/following/wycats') { status 200 }
+    """
+    When I run `ghc follower follow wycats`
+    Then the exit status should be 0
+
+  Scenario: Unfollow
+    Given the GitHub API server:
+    """
+    delete('/user/following/wycats') { status 200 }
+    """
+    When I run `ghc follower unfollow wycats`
+    Then the exit status should be 0

data/features/fork.feature

@@ -7,7 +7,18 @@ Feature: ghc fork
       And the output should contain "ghc fork create"
       And the output should contain "ghc fork list"
 
-#   Scenario: List forks
-#     When I run `ghc fork ls wycats thor` interactively
-#       And I type "q"
-#     Then the exit status should be 0
+  Scenario: List forks
+    Given the GitHub API server:
+    """
+    get('/repos/wycats/thor/forks') { status 200 }
+    """
+    When I run `ghc fork ls wycats thor`
+    Then the exit status should be 0
+
+  Scenario: Create fork
+    Given the GitHub API server:
+    """
+    post('/repos/wycats/thor/forks') { status 200 }
+    """
+    When I run `ghc fork create wycats thor`
+    Then the exit status should be 0

data/features/gist.feature

@@ -13,3 +13,91 @@ Feature: ghc gist
       And the output should contain "ghc gist star"
       And the output should contain "ghc gist starred"
       And the output should contain "ghc gist unstar"
+
+  Scenario: List gists for user
+    Given the GitHub API server:
+    """
+    get('/users/wycats/gists') { status 200 }
+    """
+    When I run `ghc gist ls -u wycats`
+    Then the exit status should be 0
+
+  Scenario: List starred gists for the authenticated user
+    Given the GitHub API server:
+    """
+    get('/gists/starred') { status 200 }
+    """
+    When I run `ghc gist ls --starred`
+    Then the exit status should be 0
+
+  Scenario: List public gists for the authenticated user
+    Given the GitHub API server:
+    """
+    get('/gists/public') { status 200 }
+    """
+    When I run `ghc gist ls`
+    Then the exit status should be 0
+
+  Scenario: Get gist
+    Given the GitHub API server:
+    """
+    get('/gists/1') { status 200 }
+    """
+    When I run `ghc gist get 1`
+    Then the exit status should be 0
+
+  Scenario: Create gist
+    Given the GitHub API server:
+    """
+    post('/gists') { status 200 }
+    """
+    When I run `ghc gist create --params=description:'desc' public:true files:'file' content:'string'`
+    Then the exit status should be 0
+
+  Scenario: Edit gist
+    Given the GitHub API server:
+    """
+    patch('/gists/1') { status 200 }
+    """
+    When I run `ghc gist edit`
+    Then the exit status should be 0
+
+  Scenario: Star gist
+    Given the GitHub API server:
+    """
+    put('/gists/1/star') { status 200 }
+    """
+    When I run `ghc gist star 1`
+    Then the exit status should be 0
+
+  Scenario: Unstar gist
+    Given the GitHub API server:
+    """
+    delete('/gists/1/star') { status 200 }
+    """
+    When I run `ghc gist unstar 1`
+    Then the exit status should be 0
+
+  Scenario: Starred gist
+    Given the GitHub API server:
+    """
+    get('/gists/1/star') { status 200 }
+    """
+    When I run `ghc gist starred 1`
+    Then the exit status should be 0
+
+  Scenario: Fork gist
+    Given the GitHub API server:
+    """
+    post('/gists/1/fork') { status 200 }
+    """
+    When I run `ghc gist fork 1`
+    Then the exit status should be 0
+
+  Scenario: Delete gist
+    Given the GitHub API server:
+    """
+    delete('/gists/1') { status 200 }
+    """
+    When I run `ghc gist del 1`
+    Then the exit status should be 0

data/features/hook.feature

@@ -10,3 +10,52 @@ Feature: ghc hook
       And the output should contain "ghc hook get"
       And the output should contain "ghc hook list"
       And the output should contain "ghc hook test"
+
+  Scenario: List hooks
+    Given the GitHub API server:
+    """
+    get('/repos/wycats/thor/hooks') { status 200 }
+    """
+    When I run `ghc hook ls wycats thor`
+    Then the exit status should be 0
+
+  Scenario: Get hook
+    Given the GitHub API server:
+    """
+    get('/repos/wycats/thor/hooks/1') { status 200 }
+    """
+    When I run `ghc hook get wycats thor 1`
+    Then the exit status should be 0
+
+  Scenario: Create hook
+    Given the GitHub API server:
+    """
+    post('/repos/wycats/thor/hooks') { status 200 }
+    """
+    When I run `ghc hook create wycats thor --params=name:web config:{}`
+    Then the exit status should be 0
+
+  Scenario: Edit hook
+    Given the GitHub API server:
+    """
+    patch('/repos/wycats/thor/hooks/1') { status 200 }
+    """
+    When I run `ghc hook edit wycats thor 1 --params=name:web config:{}`
+    Then the exit status should be 0
+
+  Scenario: Test hook
+    Given the GitHub API server:
+    """
+    post('/repos/wycats/thor/hooks/1/test') { status 200 }
+    """
+    When I run `ghc hook test wycats thor 1`
+    Then the exit status should be 0
+
+  Scenario: Delete hook
+    Given the GitHub API server:
+    """
+    delete('/repos/wycats/thor/hooks/1') { status 200 }
+    """
+    When I run `ghc hook del wycats thor 1`
+    Then the exit status should be 0
+

data/features/label.feature

@@ -14,3 +14,92 @@ Feature: ghc label
       And the output should contain "ghc label remove"
       And the output should contain "ghc label replace"
       And the output should contain "ghc label update"
+
+  Scenario: List labels
+    Given the GitHub API server:
+    """
+    get('/repos/wycats/thor/labels') { status 200 }
+    """
+    When I run `ghc label ls wycats thor`
+    Then the exit status should be 0
+
+  Scenario: Get label
+    Given the GitHub API server:
+    """
+    get('/repos/wycats/thor/labels/1') { status 200 }
+    """
+    When I run `ghc label get wycats thor 1`
+    Then the exit status should be 0
+
+  Scenario: Create label
+    Given the GitHub API server:
+    """
+    post('/repos/wycats/thor/labels') { status 200 }
+    """
+    When I run `ghc label create wycats thor --params=name:bug color:f3f3f3`
+    Then the exit status should be 0
+
+  Scenario: Update label
+    Given the GitHub API server:
+    """
+    patch('/repos/wycats/thor/labels/1') { status 200 }
+    """
+    When I run `ghc label update wycats thor 1 --params=name:bug color:f3f3f3`
+    Then the exit status should be 0
+
+  Scenario: Delete label
+    Given the GitHub API server:
+    """
+    delete('/repos/wycats/thor/labels/1') { status 200 }
+    """
+    When I run `ghc label delete wycats thor 1`
+    Then the exit status should be 0
+
+  Scenario: Add labels
+    Given the GitHub API server:
+    """
+    post('/repos/wycats/thor/issues/1/labels') { status 200 }
+    """
+    When I run `ghc label add wycats thor 1 'bug' 'feature'`
+    Then the exit status should be 0
+
+  Scenario: Remove label from an issue
+    Given the GitHub API server:
+    """
+    delete('/repos/wycats/thor/issues/1/labels/2') { status 200 }
+    """
+    When I run `ghc label remove wycats thor 2/1`
+    Then the exit status should be 0
+
+  Scenario: Remove label from an issue
+    Given the GitHub API server:
+    """
+    delete('/repos/wycats/thor/issues/1/labels/2') { status 200 }
+    """
+    When I run `ghc label remove wycats thor 2/1`
+    Then the exit status should be 0
+
+  Scenario: Remove all labels from an issue
+    Given the GitHub API server:
+    """
+    delete('/repos/wycats/thor/issues/1/labels') { status 200 }
+    """
+    When I run `ghc label remove wycats thor 1`
+    Then the exit status should be 0
+
+  Scenario: Replace labels
+    Given the GitHub API server:
+    """
+    put('/repos/wycats/thor/issues/1/labels') { status 200 }
+    """
+    When I run `ghc label replace wycats thor 1 'bug' 'feature'`
+    Then the exit status should be 0
+
+  Scenario: Milestone labels
+    Given the GitHub API server:
+    """
+    get('/repos/wycats/thor/milestones/1/labels') { status 200 }
+    """
+    When I run `ghc label milestone wycats thor 1`
+    Then the exit status should be 0
+

data/features/search_commands.feature

@@ -10,7 +10,7 @@ Feature: Github API Commands Search
     Then the exit status should be 0
     And the output should contain:
     """
-    Github CLI client
+    GitHub API v3 CLI client
 
     Commands:
     """

data/features/support/env.rb

@@ -1,4 +1,5 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__) + '/../../lib')
 require 'aruba/cucumber'
+require 'communist/cucumber'
 require 'fileutils'
 require 'rspec/expectations'

data/features/support/hooks.rb

@@ -1,7 +1,7 @@
 require 'fileutils'
 
 Before do
-  @aruba_timeout_seconds = 5
+  @aruba_timeout_seconds = 10
   @real_home = ENV['HOME']
   fake_home = File.join('/tmp', 'fakehome')
   FileUtils.rm_rf fake_home if File.exists? fake_home

data/github_cli.gemspec

@@ -21,4 +21,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rspec'
   gem.add_development_dependency 'aruba'
   gem.add_development_dependency 'rake'
+  gem.add_development_dependency 'communist'
 end

data/lib/github_cli/api.rb

@@ -22,6 +22,10 @@ module GithubCLI
         @@api = Github.new
         @@api.oauth_token = GithubCLI.config['oauth_token']
         @@api.basic_auth  = GithubCLI.config['basic_auth']
+        puts "#{ENV['TEST_HOST']}"
+        if ENV['TEST_HOST']
+          @@api.endpoint = 'http://' + ENV['TEST_HOST']
+        end
         @@api
       end
 

data/lib/github_cli/apis.rb

@@ -16,6 +16,7 @@ end
   content
   download
   email
+  event
   follower
   fork
   gist

data/lib/github_cli/apis/blob.rb

@@ -7,7 +7,7 @@ module GithubCLI
 
       def get(user, repo, sha, params, format)
         output format do
-          github_api.git_data.blobs.get user, repo, params
+          github_api.git_data.blobs.get user, repo, sha, params
         end
       end
 

data/lib/github_cli/apis/commit.rb

@@ -7,7 +7,7 @@ module GithubCLI
 
       def get(user, repo, sha, params, format)
         output format do
-          github_api.git_data.commits.get user, repo, params
+          github_api.git_data.commits.get user, repo, sha, params
         end
       end
 

data/lib/github_cli/apis/label.rb

@@ -5,65 +5,63 @@ module GithubCLI
 
     class << self
 
-      def all(params, format)
+      def all(user, repo, params, format)
         output format do
-          github_api.issues.labels params
+          github_api.issues.labels.list user, repo, params
         end
       end
 
       def get(user, repo, name, params, format)
         output format do
-          github_api.issues.get_label user, repo, name, params
+          github_api.issues.labels.get user, repo, name, params
         end
       end
 
       def create(user, repo, params, format)
         output format do
-          github_api.issues.create_label user, repo, params
+          github_api.issues.labels.create user, repo, params
         end
       end
 
       def update(user, repo, name, params, format)
         output format do
-          github_api.issues.update_label user, repo, params
+          github_api.issues.labels.update user, repo, name, params
         end
       end
 
       def delete(user, repo, name, params, format)
         output format do
-          github_api.issues.delete_label user, repo, name, params
+          github_api.issues.labels.delete user, repo, name, params
         end
       end
 
-      def issue(user, repo, number, params, format)
+      def issue(user, repo, issue_id, params, format)
         output format do
-          github_api.issues.labels_for user, repo, number, params
+          github_api.issues.labels.issue user, repo, issue_id, params
         end
       end
 
-      def add(user, repo, number, *args)
-        # TODO extract params from args
-        output :table do
-          github_api.issues.add_labels user, repo, args
+      def add(user, repo, issue_id, *args, params, format)
+        output format do
+          github_api.issues.labels.add user, repo, issue_id, *args, params
         end
       end
 
-      def remove(user, repo, number, name=nil, params, format)
+      def remove(user, repo, issue_id, label_id, params, format)
         output format do
-          github_api.issues.remove_label user, repo, number, name, params
+          github_api.issues.labels.remove user, repo, issue_id, label_id, params
         end
       end
 
-      def replace(user, repo, number, *args)
-        # TODO extract params from args
-        output :table do
-          github_api.issues.replace_labels user, repo, number, args
+      def replace(user, repo, issue_id, *args, params, format)
+        output format do
+          github_api.issues.labels.replace user, repo, issue_id, *args, params
         end
       end
 
       def milestone(user, repo, number, params, format)
         output format do
-          gitub_api.issues.milestone_labels user, repo, number, params
+          github_api.issues.labels.milestone user, repo, number, params
         end
       end
     end

data/lib/github_cli/commands/collaborators.rb

@@ -22,7 +22,7 @@ module GithubCLI
 
     desc 'remove <user> <repo> <id>', 'Remove a collaborator'
     def remove(user, repo, collab)
-      Collaborator.remove user, repo, collab, options[:params]. options[:format]
+      Collaborator.remove user, repo, collab, options[:params], options[:format]
     end
 
   end # Collaborators

data/lib/github_cli/commands/followers.rb

@@ -23,7 +23,7 @@ module GithubCLI
 
     desc 'follower <user>', 'Check if you are following a user'
     def follower(user)
-      Follower.following? user, options[:params], options[:format]
+      Follower.follower user, options[:params], options[:format]
     end
 
     desc 'follow <user>', 'Follow a user'

data/lib/github_cli/commands/gists.rb

@@ -13,12 +13,14 @@ module GithubCLI
                   :default => false,
                   :desc => 'List the authenticated users starred gists'
     def list
-      Gist.starred if options[:starred]
-
-      if options[:user]
-        options[:params]['user'] = options[:user]
+      if options[:starred]
+        Gist.starred options[:params], options[:format]
+      else
+        if options[:user]
+          options[:params]['user'] = options[:user]
+        end
+        Gist.all options[:params], options[:format]
       end
-      Gist.all options[:params], options[:format]
     end
 
     desc 'get <id>', 'Get a single gist'

data/lib/github_cli/commands/labels.rb

@@ -40,25 +40,20 @@ module GithubCLI
       Label.issue user, repo, number, options[:params], options[:format]
     end
 
-    desc 'add <user> <repo> <number>', 'Add labels to an issue.'
-    method_option :labels, :type => :string,
-                  :desc => 'Labels to be added to this issue.'
-    def add(user, repo, number)
-      Label.add user, repo, number, options[:labels], options[:params]
+    desc 'add <user> <repo> <issue_id> <label>[<label>...]', 'Add labels to <issue_id>.'
+    def add(user, repo, issue_id, *args)
+      Label.add user, repo, issue_id, *args, options[:params], options[:format]
     end
 
-    desc 'remove <user> <repo> <number>', 'List labels on an issue.'
-    method_option :name, :type => :string, :default => nil,
-                  :desc => 'Label name'
+    desc 'remove <user> <repo> [<label_id>/]<issue_id>', 'Remove <label_id> from an <issue_id>'
     def remove(user, repo, number)
-      Label.issue user, repo, number, options[:name], options[:params], options[:format]
+      label_id, issue_id  = Arguments.new(number).parse
+      Label.remove user, repo, issue_id, label_id, options[:params], options[:format]
     end
 
-    desc 'replace <user> <repo> <number>', 'Replace all labels for an issue.'
-    method_option :labels, :type => :string,
-                  :desc => 'Labels to be replace in this issue.'
-    def replace(user, repo, number)
-      Label.replace user, repo, number, options[:labels], options[:params]
+    desc 'replace <user> <repo> <issue_id> <label>[<label>...]', 'Replace all labels for an <issue_id>.'
+    def replace(user, repo, issue_id, *args)
+      Label.replace user, repo, issue_id, *args, options[:params], options[:format]
     end
 
     desc 'milestone <user> <repo> <number>', 'Get labels for every issue in a milestone.'

data/lib/github_cli/version.rb

@@ -1,3 +1,3 @@
 module GithubCLI
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: github_cli
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-12 00:00:00.000000000Z
+date: 2012-07-14 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: github_api
-  requirement: &2153403460 !ruby/object:Gem::Requirement
+  requirement: &2153314780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '0.6'
   type: :runtime
   prerelease: false
-  version_requirements: *2153403460
+  version_requirements: *2153314780
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2153403000 !ruby/object:Gem::Requirement
+  requirement: &2153314140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153403000
+  version_requirements: *2153314140
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153402520 !ruby/object:Gem::Requirement
+  requirement: &2153313280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153402520
+  version_requirements: *2153313280
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &2153401860 !ruby/object:Gem::Requirement
+  requirement: &2153312620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153401860
+  version_requirements: *2153312620
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2153401360 !ruby/object:Gem::Requirement
+  requirement: &2153311820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,18 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153401360
+  version_requirements: *2153311820
+- !ruby/object:Gem::Dependency
+  name: communist
+  requirement: &2153311020 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2153311020
 description: CLI-based access to GitHub API v3
 email:
 - ''