github_cli 0.5.5 → 0.5.6

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+0.5.6 (April 1, 2013)
+
+* Change gcli interface to be more concise and not include gcli name
+* Change issue command to add specific options and add tests
+* Change user command to add specific options and add tests
+* Change team command to add specific options and add tests
+
 0.5.5 (March 30, 2013)
 
 * Change PullRequest commands to take specific options and add tests

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    github_cli (0.5.5)
+    github_cli (0.5.6)
       github_api (~> 0.9)
 
 GEM

data/features/assignee.feature

@@ -5,8 +5,8 @@ Feature: gcli assignee
 
     When I run `gcli assignee`
     Then the exit status should be 0
-      And the output should contain "gcli assignee list"
-      And the output should contain "gcli assignee check"
+      And the output should contain "assignee list"
+      And the output should contain "assignee check"
 
   Scenario: List assignees
     Given the GitHub API server:

data/features/blob.feature

@@ -5,8 +5,8 @@ Feature: gcli blob
 
     When I run `gcli blob`
     Then the exit status should be 0
-      And the output should contain "gcli blob get"
-      And the output should contain "gcli blob create"
+      And the output should contain "blob get"
+      And the output should contain "blob create"
 
   Scenario: Get blob
     Given the GitHub API server:

data/features/collaborator.feature

@@ -5,10 +5,10 @@ Feature: gcli collab
 
     When I run `gcli collab`
     Then the exit status should be 0
-      And the output should contain "gcli collab list"
-      And the output should contain "gcli collab add"
-      And the output should contain "gcli collab collab"
-      And the output should contain "gcli collab remove"
+      And the output should contain "collab list"
+      And the output should contain "collab add"
+      And the output should contain "collab collab"
+      And the output should contain "collab remove"
 
   Scenario: List collaborators
     Given the GitHub API server:

data/features/commit.feature

@@ -5,8 +5,8 @@ Feature: gcli commit
 
     When I run `gcli commit`
     Then the exit status should be 0
-      And the output should contain "gcli commit get"
-      And the output should contain "gcli commit create"
+      And the output should contain "commit get"
+      And the output should contain "commit create"
 
   Scenario: Get commit
     Given the GitHub API server:

data/features/email.feature

@@ -5,9 +5,9 @@ Feature: gcli email
 
     When I run `gcli email`
     Then the exit status should be 0
-      And the output should contain "gcli email delete"
-      And the output should contain "gcli email list"
-      And the output should contain "gcli email add"
+      And the output should contain "email delete"
+      And the output should contain "email list"
+      And the output should contain "email add"
 
   Scenario: List emails
     Given the GitHub API server:

data/features/event.feature

@@ -5,14 +5,14 @@ Feature: gcli event
 
     When I run `gcli event`
     Then the exit status should be 0
-      And the output should contain "gcli event issue"
-      And the output should contain "gcli event network"
-      And the output should contain "gcli event org"
-      And the output should contain "gcli event performed"
-      And the output should contain "gcli event public"
-      And the output should contain "gcli event received"
-      And the output should contain "gcli event repo"
-      And the output should contain "gcli event user_org"
+      And the output should contain "event issue"
+      And the output should contain "event network"
+      And the output should contain "event org"
+      And the output should contain "event performed"
+      And the output should contain "event public"
+      And the output should contain "event received"
+      And the output should contain "event repo"
+      And the output should contain "event user_org"
 
   Scenario: Public events
     Given the GitHub API server:

data/features/follower.feature

@@ -5,11 +5,11 @@ Feature: gcli follower
 
     When I run `gcli follower`
     Then the exit status should be 0
-      And the output should contain "gcli follower follow"
-      And the output should contain "gcli follower follower"
-      And the output should contain "gcli follower following"
-      And the output should contain "gcli follower list"
-      And the output should contain "gcli follower unfollow"
+      And the output should contain "follower follow"
+      And the output should contain "follower follower"
+      And the output should contain "follower following"
+      And the output should contain "follower list"
+      And the output should contain "follower unfollow"
 
   Scenario: List for user
     Given the GitHub API server:

data/features/gist.feature

@@ -5,15 +5,15 @@ Feature: gcli gist
 
     When I run `gcli gist`
     Then the exit status should be 0
-      And the output should contain "gcli gist create"
-      And the output should contain "gcli gist delete"
-      And the output should contain "gcli gist edit"
-      And the output should contain "gcli gist get"
-      And the output should contain "gcli gist fork"
-      And the output should contain "gcli gist list"
-      And the output should contain "gcli gist star"
-      And the output should contain "gcli gist starred"
-      And the output should contain "gcli gist unstar"
+      And the output should contain "gist create"
+      And the output should contain "gist delete"
+      And the output should contain "gist edit"
+      And the output should contain "gist get"
+      And the output should contain "gist fork"
+      And the output should contain "gist list"
+      And the output should contain "gist star"
+      And the output should contain "gist starred"
+      And the output should contain "gist unstar"
 
   Scenario: List gists for user
     Given the GitHub API server:

data/features/issue.feature

@@ -1,19 +1,27 @@
 Feature: gcli issue
 
+  @ci-run
   Scenario: Available commands
     When I run `gcli issue`
     Then the exit status should be 0
-      And the output should contain "gcli issue create"
-      And the output should contain "gcli issue edit"
-      And the output should contain "gcli issue get"
-      And the output should contain "gcli issue list"
-      And the output should contain "gcli issue repo"
+      And the output should contain "issue create"
+      And the output should contain "issue edit"
+      And the output should contain "issue get"
+      And the output should contain "issue list"
 
-  Scenario: List issues
+  Scenario: List all issues
     Given the GitHub API server:
     """
     get('/issues') { status 200 }
     """
+    When I run `gcli issue ls --all`
+    Then the exit status should be 0
+
+  Scenario: List issues for authenticated user
+    Given the GitHub API server:
+    """
+    get('/user/issues') { status 200 }
+    """
     When I run `gcli issue ls`
     Then the exit status should be 0
 
@@ -22,7 +30,15 @@ Feature: gcli issue
     """
     get('/repos/wycats/thor/issues') { status 200 }
     """
-    When I run `gcli issue repo wycats thor`
+    When I run `gcli issue ls --user wycats --repo thor`
+    Then the exit status should be 0
+
+  Scenario: List issues for an organization
+    Given the GitHub API server:
+    """
+    get('/orgs/rails/issues') { status 200 }
+    """
+    When I run `gcli issue ls --org rails`
     Then the exit status should be 0
 
   Scenario: Get issue
@@ -38,7 +54,7 @@ Feature: gcli issue
     """
     post('/repos/wycats/thor/issues') { status 200 }
     """
-    When I run `gcli issue create wycats thor --params=title:'Found a bug'`
+    When I run `gcli issue create wycats thor --title 'Found a bug'`
     Then the exit status should be 0
 
   Scenario: Edit issue
@@ -46,6 +62,6 @@ Feature: gcli issue
     """
     patch('/repos/wycats/thor/issues/1') { status 200 }
     """
-    When I run `gcli issue edit wycats thor 1 --params=title:'Found a bug'`
+    When I run `gcli issue edit wycats thor 1 --title 'Found a bug'`
     Then the exit status should be 0
 

data/features/key.feature

@@ -4,11 +4,11 @@ Feature: gcli key
   Scenario: Available commands
     When I run `gcli key`
     Then the exit status should be 0
-      And the output should contain "gcli key create"
-      And the output should contain "gcli key delete"
-      And the output should contain "gcli key edit"
-      And the output should contain "gcli key get"
-      And the output should contain "gcli key list"
+      And the output should contain "key create"
+      And the output should contain "key delete"
+      And the output should contain "key edit"
+      And the output should contain "key get"
+      And the output should contain "key list"
 
   Scenario: List keys
     Given the GitHub API server:

data/features/milestone.feature

@@ -5,11 +5,11 @@ Feature: gcli milestone
 
     When I run `gcli milestone`
     Then the exit status should be 0
-      And the output should contain "gcli milestone create"
-      And the output should contain "gcli milestone delete"
-      And the output should contain "gcli milestone get"
-      And the output should contain "gcli milestone list"
-      And the output should contain "gcli milestone update"
+      And the output should contain "milestone create"
+      And the output should contain "milestone delete"
+      And the output should contain "milestone get"
+      And the output should contain "milestone list"
+      And the output should contain "milestone update"
 
   Scenario: List milestones
     Given the GitHub API server:

data/features/pull_request.feature

@@ -5,14 +5,14 @@ Feature: gcli pull request
 
     When I run `gcli pull`
     Then the exit status should be 0
-      And the output should contain "gcli pull commits"
-      And the output should contain "gcli pull create"
-      And the output should contain "gcli pull files"
-      And the output should contain "gcli pull get"
-      And the output should contain "gcli pull list"
-      And the output should contain "gcli pull merge"
-      And the output should contain "gcli pull merged"
-      And the output should contain "gcli pull update"
+      And the output should contain "pull commits"
+      And the output should contain "pull create"
+      And the output should contain "pull files"
+      And the output should contain "pull get"
+      And the output should contain "pull list"
+      And the output should contain "pull merge"
+      And the output should contain "pull merged"
+      And the output should contain "pull update"
 
   Scenario: List pull requests
     Given the GitHub API server:

data/features/reference.feature

@@ -5,11 +5,11 @@ Feature: gcli ref
 
     When I run `gcli ref`
     Then the exit status should be 0
-      And the output should contain "gcli ref create"
-      And the output should contain "gcli ref delete"
-      And the output should contain "gcli ref get"
-      And the output should contain "gcli ref list"
-      And the output should contain "gcli ref update"
+      And the output should contain "ref create"
+      And the output should contain "ref delete"
+      And the output should contain "ref get"
+      And the output should contain "ref list"
+      And the output should contain "ref update"
 
   Scenario: List all references
     Given the GitHub API server:

data/features/repository.feature

@@ -4,17 +4,17 @@ Feature: gcli repository
   Scenario: Available commands
     When I run `gcli repo`
     Then the exit status should be 0
-      And the output should contain "gcli repo branch"
-      And the output should contain "gcli repo branches"
-      And the output should contain "gcli repo contribs"
-      And the output should contain "gcli repo create"
-      And the output should contain "gcli repo edit"
-      And the output should contain "gcli repo delete"
-      And the output should contain "gcli repo get"
-      And the output should contain "gcli repo list"
-      And the output should contain "gcli repo langs"
-      And the output should contain "gcli repo tags"
-      And the output should contain "gcli repo teams"
+      And the output should contain "repo branch"
+      And the output should contain "repo branches"
+      And the output should contain "repo contribs"
+      And the output should contain "repo create"
+      And the output should contain "repo edit"
+      And the output should contain "repo delete"
+      And the output should contain "repo get"
+      And the output should contain "repo list"
+      And the output should contain "repo langs"
+      And the output should contain "repo tags"
+      And the output should contain "repo teams"
 
   Scenario: List all repositories
     Given the GitHub API server:

data/features/starring.feature

@@ -5,11 +5,11 @@ Feature: gcli star
 
     When I run `gcli star`
     Then the exit status should be 0
-      And the output should contain "gcli star list"
-      And the output should contain "gcli star star"
-      And the output should contain "gcli star unstar"
-      And the output should contain "gcli star starred"
-      And the output should contain "gcli star starring"
+      And the output should contain "star list"
+      And the output should contain "star star"
+      And the output should contain "star unstar"
+      And the output should contain "star starred"
+      And the output should contain "star starring"
 
   Scenario: List stargazers
     Given the GitHub API server:

data/features/tag.feature

@@ -5,8 +5,8 @@ Feature: gcli tag
 
     When I run `gcli tag`
     Then the exit status should be 0
-      And the output should contain "gcli tag create"
-      And the output should contain "gcli tag get"
+      And the output should contain "tag create"
+      And the output should contain "tag get"
 
   Scenario: Get tag
     Given the GitHub API server:

data/features/team.feature

@@ -1,21 +1,22 @@
 Feature: gcli team
 
+  @ci-run
   Scenario: Available commands
     When I run `gcli team`
     Then the exit status should be 0
-      And the output should contain "gcli team add_member"
-      And the output should contain "gcli team add_repo"
-      And the output should contain "gcli team create"
-      And the output should contain "gcli team delete"
-      And the output should contain "gcli team edit"
-      And the output should contain "gcli team get"
-      And the output should contain "gcli team list"
-      And the output should contain "gcli team list_member"
-      And the output should contain "gcli team list_repo"
-      And the output should contain "gcli team member"
-      And the output should contain "gcli team remove_member"
-      And the output should contain "gcli team remove_repo"
-      And the output should contain "gcli team repo"
+      And the output should contain "team add_member"
+      And the output should contain "team add_repo"
+      And the output should contain "team create"
+      And the output should contain "team delete"
+      And the output should contain "team edit"
+      And the output should contain "team get"
+      And the output should contain "team list"
+      And the output should contain "team list_member"
+      And the output should contain "team list_repo"
+      And the output should contain "team member"
+      And the output should contain "team remove_member"
+      And the output should contain "team remove_repo"
+      And the output should contain "team repo"
 
   Scenario: List all teams
     Given the GitHub API server:

data/features/tree.feature

@@ -5,8 +5,8 @@ Feature: gcli tree
 
     When I run `gcli tree`
     Then the exit status should be 0
-      And the output should contain "gcli tree create"
-      And the output should contain "gcli tree get"
+      And the output should contain "tree create"
+      And the output should contain "tree get"
 
   Scenario: Get tree
     Given the GitHub API server:

data/features/user.feature

@@ -1,11 +1,20 @@
 Feature: gcli user
 
+  @ci-run
   Scenario: Available commands
 
     When I run `gcli user`
     Then the exit status should be 0
-      And the output should contain "gcli user get"
-      And the output should contain "gcli user update"
+      And the output should contain "user get"
+      And the output should contain "user update"
+
+  Scenario: List all users
+    Given the GitHub API server:
+    """
+    get('/users') { status 200 }
+    """
+    When I run `gcli user ls`
+    Then the exit status should be 0
 
   Scenario: Get user
     Given the GitHub API server:
@@ -28,5 +37,5 @@ Feature: gcli user
     """
     patch('/user') { status 200 }
     """
-    When I run `gcli user update --params=name:peter-murach`
+    When I run `gcli user update --name=peter-murach`
     Then the exit status should be 0

data/features/watching.feature

@@ -5,11 +5,11 @@ Feature: gcli watching
 
     When I run `gcli watch`
     Then the exit status should be 0
-      And the output should contain "gcli watch list"
-      And the output should contain "gcli watch start"
-      And the output should contain "gcli watch stop"
-      And the output should contain "gcli watch watched"
-      And the output should contain "gcli watch watching"
+      And the output should contain "watch list"
+      And the output should contain "watch start"
+      And the output should contain "watch stop"
+      And the output should contain "watch watched"
+      And the output should contain "watch watching"
 
   Scenario: List watchers
     Given the GitHub API server:

data/lib/github_cli/apis/issue.rb

@@ -5,15 +5,9 @@ module GithubCLI
 
     class << self
 
-      def all(params, format)
+      def all(arg, params, format)
         output format do
-          github_api.issues.list params
-        end
-      end
-
-      def all_repo(user, repo, params, format)
-        output format do
-          github_api.issues.list_repo user, repo, params
+          github_api.issues.list arg, params
         end
       end
 

data/lib/github_cli/apis/user.rb

@@ -11,9 +11,9 @@ module GithubCLI
         end
       end
 
-      def get(user, params, format)
+      def get(params, format)
         output format do
-          github_api.users.get params.update(:user => user)
+          github_api.users.get params
         end
       end
 

data/lib/github_cli/cli.rb

@@ -68,7 +68,7 @@ module GithubCLI
       end
     end
 
-    desc 'init [<filename>]', 'Generates a configuration file in your home directory'
+    desc 'init [<filename>]', 'Create a configuration file or overwirte existing one'
     long_desc <<-DESC
       Initializes a configuration file where you can set default options for
       interacting with GitHub API.\n

data/lib/github_cli/command/usage.rb

@@ -5,7 +5,7 @@ module GithubCLI
   class Command
     class Usage
 
-      DEFAULT_INDENT = 11
+      DEFAULT_INDENT = 12
 
       # Returns command
       attr_reader :command

data/lib/github_cli/commands/issues.rb

@@ -5,9 +5,32 @@ module GithubCLI
 
     namespace :issue
 
-    desc 'list', 'List all issues'
+    option :filter, :type => :string,
+           :banner => "assigned|created|mentioned|subscribed|all"
+    option :milstone, :type => :string,
+           :banner => "number|none|*"
+    option :creator, :type => :string,
+           :desc => "user login"
+    option :mentioned, :type => :string,
+           :desc => "user login"
+    option :state, :type => :string, :banner => "open|closed",
+           :desc => "open, closed, default: open"
+    option :labels, :type => :array,
+           :desc => "list of comma separated Label names. Example: bug,ui,@high"
+    option :sort, :type => :string, :banner => "created|updated|comments",
+           :desc => "created, updated, comments, default: created"
+    option :direction, :type => :string, :banner => "asc|desc",
+           :desc => "asc or desc, default: desc"
+    option :since, :type => :string,
+           :desc => "string of a timestamp in ISO 8601 format: YYYY-MM-DDTHH:MM:SSZ"
+    option :org, :type => :string, :aliases => ["-o"]
+    option :user, :type => :string, :aliases => ["-u"]
+    option :repo, :type => :string, :aliases => ["-r"]
+    option :all, :type => :boolean,
+           :desc => "List all issues across all the authenticated user’s visible repositories"
+    desc 'list', 'List issues'
     long_desc <<-DESC
-      ghc issue list --params filter:'assigned', state:'open'
+      ghc issue list --filter=assigned --state=open
 
       Parameters
 
@@ -16,44 +39,56 @@ module GithubCLI
           * created: Issues assigned to you (default) \n
           * mentioned: Issues assigned to you (default)\n
           * subscribed: Issues assigned to you (default)\n
-        state - open, closed, default: open \n
-        labels - String list of comma separated Label names. Example: bug,ui,@high
-        sort - created, updated, comments, default: created \n
-        direction - asc, desc, default: desc \n
-        since - Optional string of a timestamp in ISO 8601 format: YYYY-MM-DDTHH:MM:SSZ \n
-    DESC
-    def list
-      Issue.all options[:params], options[:format]
-    end
-
-    desc 'repo <user> <repo>', 'List all issues for a repository'
-    long_desc <<-DESC
-      Parameters
-
         milestone:\n
           * Integer Milestone number\n
           * none for Issues with no Milestone.\n
           *  * for Issues with any Milestone\n
-        state - open, closed, default: open \n
         assignee:\n
           * String User login\n
           * none for Issues with no assigned User.\n
           *  * for Issues with any assigned User.\n
-        mentioned - String User login\n
-        labels - String list of comma separated Label names. Example: bug,ui,@high\n
-        sort - created, updated, comments, default: created\n
-        direction - asc, desc, default: desc\n
-        since - Optional string of a timestamp in ISO 8601 format: YYYY-MM-DDTHH:MM:SSZ\n
+        creator - string - user login\n
+        mentioned - string - user login\n
+        state - open, closed, default: open \n
+        labels - String list of comma separated Label names. Example: bug,ui,@high
+        sort - created, updated, comments, default: created \n
+        direction - asc, desc, default: desc \n
+        since - Optional string of a timestamp in ISO 8601 format: YYYY-MM-DDTHH:MM:SSZ \n
     DESC
-    def repo(user, repo)
-      Issue.all_repo user, repo, options[:params], options[:format]
+    def list
+      params = options[:params].dup
+      params['org']       = options[:org]       if options[:org]
+      params['user']      = options[:user]      if options[:user]
+      params['repo']      = options[:repo]      if options[:repo]
+      params['filter']    = options[:filter]    if options[:filter]
+      params['milestone'] = options[:milestone] if options[:milestone]
+      params['assignee']  = options[:assignee]  if options[:assignee]
+      params['creator']   = options[:creator]   if options[:creator]
+      params['mentioned'] = options[:mentioned] if options[:mentioned]
+      params['sort']      = options[:sort]      if options[:sort]
+      params['state']     = options[:state]     if options[:state]
+      params['labels']    = options[:labels]    if options[:labels]
+      params['direction'] = options[:direction] if options[:direction]
+      params['since']     = options[:since]     if options[:since]
+
+      arg = []
+      arg = :user if !options[:all] && !(options[:user] || options[:org])
+      Issue.all arg, params, options[:format]
     end
 
-    desc 'get <user> <repo> <issue-id>', 'Get a single issue'
-    def get(user, repo, id)
-      Issue.get user, repo, id, options[:params], options[:format]
+    desc 'get <user> <repo> <number>', 'Get a single issue'
+    def get(user, repo, number)
+      Issue.get user, repo, number, options[:params], options[:format]
     end
 
+    option :title, :type => :string, :required => true
+    option :body, :type => :string
+    option :assignee, :type => :string,
+           :desc => "Login for the user that this issue should be assigned to."
+    option :milestone, :type => :numeric,
+           :desc => "Milestone to associate this issue with."
+    option :labels, :type => :array,
+           :desc => "Labels to associate with this issue."
     desc 'create <user> <repo>', 'Create an issue.'
     long_desc <<-DESC
       Parameters
@@ -66,13 +101,30 @@ module GithubCLI
 
       Example
 
-      ghc issue create wycats thor --params=title:'Found a bug'
+      ghc issue create wycats thor --title='Found a bug'
     DESC
     def create(user, repo)
-      Issue.create user, repo, options[:params], options[:format]
+      params = options[:params].dup
+      params['title']     = options[:title]
+      params['body']      = options[:body]      if options[:body]
+      params['assignee']  = options[:assignee]  if options[:assignee]
+      params['milestone'] = options[:milestone] if options[:milestone]
+      params['labels']    = options[:labels]    if options[:labels]
+
+      Issue.create user, repo, params, options[:format]
     end
 
-    desc 'edit <user> <repo> <issue-id>', 'Edit an issue.'
+    option :title, :type => :string, :required => true
+    option :body, :type => :string
+    option :assignee, :type => :string,
+           :desc => "Login for the user that this issue should be assigned to."
+    option :milestone, :type => :string,
+           :desc => "Milestone to associate this issue with."
+    option :labels, :type => :array,
+           :desc => "Labels to associate with this issue."
+    option :state, :type => :string, :banner => "open|closed",
+           :desc => "open, closed, default: open"
+    desc 'edit <user> <repo> <number>', 'Edit an issue.'
     long_desc <<-DESC
       Parameters
 
@@ -85,10 +137,18 @@ module GithubCLI
 
       Example
 
-      ghc issue edit wycats thor 1 --params=title:'Found a bug'
+      ghc issue edit wycats thor 1 --title='Found a bug'
     DESC
-    def edit(user, repo, id)
-      Issue.edit user, repo, id, options[:params], options[:format]
+    def edit(user, repo, number)
+      params = options[:params].dup
+      params['title']     = options[:title]
+      params['body']      = options[:body]      if options[:body]
+      params['assignee']  = options[:assignee]  if options[:assignee]
+      params['milestone'] = options[:milestone] if options[:milestone]
+      params['labels']    = options[:labels]    if options[:labels]
+      params['state']     = options[:state]     if options[:state]
+
+      Issue.edit user, repo, number, params, options[:format]
     end
 
   end # Issues

data/lib/github_cli/commands/teams.rb

@@ -10,11 +10,14 @@ module GithubCLI
       Team.all org, options[:params], options[:format]
     end
 
-    desc 'get <team-id>', "Get a team"
+    desc 'get <id>', "Get a team"
     def get(id)
       Team.get id, options[:params], options[:format]
     end
 
+    option :name, :type => :string, :required => true
+    option :repo_names, :type => :array
+    option :permission, :type => :string, :banner => "pull|push|admin"
     desc 'create <org>', "Create a team"
     long_desc <<-DESC
       In order to create a team, the authenticated user must be an owner of :org.
@@ -29,10 +32,17 @@ module GithubCLI
       * admin - team members can pull, push and administor these repositories.\n
     DESC
     def create(org)
-      Team.create org, options[:params], options[:format]
+      params = options[:params].dup
+      params['name'] = options[:name]
+      params['repo_names'] = options[:repo_names] if options[:repo_names]
+      params['permission'] = options[:permission] if options[:permission]
+
+      Team.create org, params, options[:format]
     end
 
-    desc 'edit <team-id>', "Edit team <team-id>"
+    option :name, :type => :string, :required => true
+    option :permission, :type => :string, :banner => "pull|push|admin"
+    desc 'edit <id>', "Edit team <id>"
     long_desc <<-DESC
       In order to edit a team, the authenticated user must be an owner of the org that the team is associated with.
 
@@ -45,10 +55,14 @@ module GithubCLI
       * admin - team members can pull, push and administor these repositories.\n
     DESC
     def edit(id)
-      Team.edit id, options[:params], options[:format]
+      params = options[:params].dup
+      params['name'] = options[:name]
+      params['permission'] = options[:permission] if options[:permission]
+
+      Team.edit id, params, options[:format]
     end
 
-    desc 'delete <team-id>', 'Delete team <team-id>'
+    desc 'delete <id>', 'Delete team <id>'
     long_desc <<-DESC
       In order to delete a team, the authenticated user must be an owner of the org that the team is associated with.
     DESC
@@ -56,12 +70,12 @@ module GithubCLI
       Team.delete id, options[:params], options[:format]
     end
 
-    desc 'list_member <team-id>', "List team <team-id> members"
+    desc 'list_member <id>', "List team <id> members"
     def list_member(id)
       Team.all_member id, options[:params], options[:format]
     end
 
-    desc 'member <team-id> <user>', 'Check if <user> is a team member'
+    desc 'member <id> <user>', 'Check if <user> is a team member'
     long_desc <<-DESC
       In order to get if a user is a member of a team, the authenticated user must be a member of the team.
     DESC
@@ -69,7 +83,7 @@ module GithubCLI
       Team.member id, user, options[:params], options[:format]
     end
 
-    desc 'add_member <team-id> <user>', 'Add team member'
+    desc 'add_member <id> <user>', 'Add team member'
     long_desc <<-DESC
       In order to add a user to a team, the authenticated user must have ‘admin’ permissions to the team or be an owner of the org that the team is associated with.
     DESC
@@ -77,7 +91,7 @@ module GithubCLI
       Team.add_member id, user, options[:params], options[:format]
     end
 
-    desc 'remove_member <team-id> <user>', 'Remove team member'
+    desc 'remove_member <id> <user>', 'Remove team member'
     long_desc <<-DESC
       In order to remove a user from a team, the authenticated user must have
       ‘admin’ permissions to the team or be an owner of the org that the team
@@ -88,17 +102,17 @@ module GithubCLI
       Team.remove_member id, user, options[:params], options[:format]
     end
 
-    desc 'list_repo <team-id>', "List team <team-id> repositories"
+    desc 'list_repo <id>', "List team <id> repositories"
     def list_repo(id)
       Team.all_repo id, options[:params], options[:format]
     end
 
-    desc 'repo <team-id> <user> <repo>', 'Check if <repo> is managed by <team-id> team'
+    desc 'repo <id> <user> <repo>', 'Check if <repo> is managed by team <id>'
     def repo(id, user, repo)
       Team.repo id, user, repo, options[:params], options[:format]
     end
 
-    desc 'add_repo <team-id> <user> <repo>', 'Add team <repo>'
+    desc 'add_repo <id> <user> <repo>', 'Add team <repo>'
     long_desc <<-DESC
       In order to add a repo to a team, the authenticated user must be an owner
       of the org that the team is associated with. Also, the repo must be owned
@@ -108,7 +122,7 @@ module GithubCLI
       Team.add_repo id, user, repo, options[:params], options[:format]
     end
 
-    desc 'remove_repo <team-id> <user> <repo>', 'Remove team <repo>'
+    desc 'remove_repo <id> <user> <repo>', 'Remove team <repo>'
     long_desc <<-DESC
       In order to remove a repo from a team, the authenticated user must be an
       owner of the org that the team is associated with. NOTE: This does not

data/lib/github_cli/commands/users.rb

@@ -19,7 +19,9 @@ module GithubCLI
            :desc => 'Get a single unauthenticated <user>',
            :banner => '<user>'
     def get
-      User.get options[:user], options[:params], options[:format]
+      params = options[:params].dup
+      params['user'] = options[:user] if options[:user]
+      User.get params, options[:format]
     end
 
     desc 'update', 'Update the authenticated user'

data/lib/github_cli/thor_ext.rb

@@ -5,21 +5,38 @@ class Thor
 
   class << self
 
+    def banner(command, namespace=nil, subcommand=false)
+      "#{command.formatted_usage(self, $thor_runner, subcommand)}"
+    end
+
     def help(shell, subcommand = false)
-      list = printable_tasks(true, subcommand)
+      list = printable_commands(true, subcommand)
       Thor::Util.thor_classes_in(self).each do |klass|
-        list += klass.printable_tasks(false)
+        list += klass.printable_commands(false)
       end
       list.sort!{ |a,b| a[0] <=> b[0] }
 
       GithubCLI::Terminal.print_usage global_flags, list[0][0]
 
       shell.say "Commands:"
-      shell.print_table(list, :indent => 2, :truncate => true)
+      shell.print_table(list, :indent => 3, :truncate => true)
       shell.say
       class_options_help(shell)
     end
 
+    # Returns commands ready to be printed.
+    def printable_commands(all = true, subcommand = false)
+      (all ? all_commands : commands).map do |_, command|
+        next if command.hidden?
+        item = []
+        item << banner(command, false, subcommand).gsub(/#{basename} /, '')
+        item << (command.description ? "# #{command.description.gsub(/\s+/m,' ')}" : "")
+        item
+      end.compact
+    end
+    alias printable_tasks printable_commands
+
+
     # String representation of all available global flags
     def global_flags
       return if class_options.empty?

data/lib/github_cli/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module GithubCLI
-  VERSION = "0.5.5"
+  VERSION = "0.5.6"
 end

data/spec/github_cli/commands/issues_spec.rb

@@ -0,0 +1,62 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe GithubCLI::Commands::Issues do
+  let(:format) { 'table' }
+  let(:user)   { 'peter-murach' }
+  let(:repo)   { 'github_cli' }
+  let(:org)    { 'github' }
+  let(:number) { 1 }
+  let(:api_class) { GithubCLI::Issue }
+
+  it "invokes issue:list" do
+    api_class.should_receive(:all).with(:user, {}, format)
+    subject.invoke "issue:list", []
+  end
+
+  it "invokes issue:list --all" do
+    api_class.should_receive(:all).with([], {}, format)
+    subject.invoke "issue:list", [], :all => true
+  end
+
+  it "invokes issue:list --org" do
+    api_class.should_receive(:all).with([], {"org" => org}, format)
+    subject.invoke "issue:list", [], :org => org
+  end
+
+  it "invokes issue:list --user --repo" do
+    api_class.should_receive(:all).with([], {"user" => user, "repo" => repo}, format)
+    subject.invoke "issue:list", [], :user => user, :repo => repo
+  end
+
+  it "invokes issue:get" do
+    api_class.should_receive(:get).with(user, repo, number, {}, format)
+    subject.invoke "issue:get", [user, repo, number]
+  end
+
+  it "invokes issue:create --title" do
+    api_class.should_receive(:create).with(user, repo, {"title" => 'new'}, format)
+    subject.invoke "issue:create", [user, repo], :title => 'new'
+  end
+
+  it "invokes issue:create --title --milestone" do
+    api_class.should_receive(:create).with(user, repo, {"title" => 'new', 
+      'milestone' => 1}, format)
+    subject.invoke "issue:create", [user, repo], :title => 'new', :milestone => 1
+  end
+
+  it "invokes issue:edit --title" do
+    api_class.should_receive(:edit).with(user, repo, number,
+      {"title" => 'new'}, format)
+    subject.invoke "issue:edit", [user, repo, number], :title => 'new'
+  end
+
+  it "invokes issue:edit --title --milestone" do
+    api_class.should_receive(:edit).with(user, repo, number, {"title" => 'new',
+      'milestone' => number}, format)
+    subject.invoke "issue:edit", [user, repo, number], :title => 'new',
+       :milestone => number
+  end
+
+end

data/spec/github_cli/commands/teams_spec.rb

@@ -0,0 +1,77 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe GithubCLI::Commands::Teams do
+  let(:format) { 'table' }
+  let(:user)   { 'peter-murach' }
+  let(:repo)   { 'github_cli' }
+  let(:org)    { 'rails' }
+  let(:id)     { 1 }
+  let(:api_class) { GithubCLI::Team }
+
+  it "invokes team:list" do
+    api_class.should_receive(:all).with(org, {}, format)
+    subject.invoke "team:list", [org]
+  end
+
+  it "invokes team:get" do
+    api_class.should_receive(:get).with(id, {}, format)
+    subject.invoke "team:get", [id]
+  end
+
+  it "invokes team:create --name" do
+    api_class.should_receive(:create).with(org, {"name" => 'new'}, format)
+    subject.invoke "team:create", [org], :name => 'new'
+  end
+
+  it "invokes team:edit --name" do
+    api_class.should_receive(:edit).with(id, {"name" => 'new'}, format)
+    subject.invoke "team:edit", [id], :name => 'new'
+  end
+
+  it "invokes team:delete" do
+    api_class.should_receive(:delete).with(id, {}, format)
+    subject.invoke "team:delete", [id]
+  end
+
+  it "invokes team:list_member" do
+    api_class.should_receive(:all_member).with(id, {}, format)
+    subject.invoke "team:list_member", [id]
+  end
+
+  it "invokes team:member" do
+    api_class.should_receive(:member).with(id, user, {}, format)
+    subject.invoke "team:member", [id, user]
+  end
+
+  it "invokes team:add_member" do
+    api_class.should_receive(:add_member).with(id, user, {}, format)
+    subject.invoke "team:add_member", [id, user]
+  end
+
+  it "invokes team:remove_member" do
+    api_class.should_receive(:remove_member).with(id, user, {}, format)
+    subject.invoke "team:remove_member", [id, user]
+  end
+
+  it "invokes team:list_repo" do
+    api_class.should_receive(:all_repo).with(id, {}, format)
+    subject.invoke "team:list_repo", [id]
+  end
+
+  it "invokes team:repo" do
+    api_class.should_receive(:repo).with(id, user, repo, {}, format)
+    subject.invoke "team:repo", [id, user, repo]
+  end
+
+  it "invokes team:add_repo" do
+    api_class.should_receive(:add_repo).with(id, user, repo, {}, format)
+    subject.invoke "team:add_repo", [id, user, repo]
+  end
+
+  it "invokes team:remove_repo" do
+    api_class.should_receive(:remove_repo).with(id, user, repo, {}, format)
+    subject.invoke "team:remove_repo", [id, user, repo]
+  end
+end

data/spec/github_cli/commands/users_spec.rb

@@ -0,0 +1,30 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe GithubCLI::Commands::Users do
+  let(:format) { 'table' }
+  let(:user)   { 'peter-murach' }
+  let(:name)   { 'github_cli' }
+  let(:api_class) { GithubCLI::User }
+
+  it "invokes user:list" do
+    api_class.should_receive(:all).with({}, format)
+    subject.invoke "user:list", []
+  end
+
+  it "invokes user:get" do
+    api_class.should_receive(:get).with({}, format)
+    subject.invoke "user:get", []
+  end
+
+  it "invokes user:get" do
+    api_class.should_receive(:get).with({'user' => user}, format)
+    subject.invoke "user:get", [], :user => user
+  end
+
+  it "invokes user:update --name" do
+    api_class.should_receive(:update).with({'name' => name}, format)
+    subject.invoke "user:update", [], :name => name
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: github_cli
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-30 00:00:00.000000000Z
+date: 2013-04-01 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: github_api
-  requirement: &2156305200 !ruby/object:Gem::Requirement
+  requirement: &2153408520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '0.9'
   type: :runtime
   prerelease: false
-  version_requirements: *2156305200
+  version_requirements: *2153408520
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2156304760 !ruby/object:Gem::Requirement
+  requirement: &2153408000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156304760
+  version_requirements: *2153408000
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &2156304140 !ruby/object:Gem::Requirement
+  requirement: &2153407340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156304140
+  version_requirements: *2153407340
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2156303440 !ruby/object:Gem::Requirement
+  requirement: &2153406720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156303440
+  version_requirements: *2153406720
 - !ruby/object:Gem::Dependency
   name: communist
-  requirement: &2156302700 !ruby/object:Gem::Requirement
+  requirement: &2153405940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156302700
+  version_requirements: *2153405940
 - !ruby/object:Gem::Dependency
   name: ronn
-  requirement: &2156301940 !ruby/object:Gem::Requirement
+  requirement: &2153405400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156301940
+  version_requirements: *2153405400
 description: CLI-based access to GitHub API v3
 email:
 - ''
@@ -273,6 +273,7 @@ files:
 - spec/github_cli/commands/events_spec.rb
 - spec/github_cli/commands/followers_spec.rb
 - spec/github_cli/commands/gists_spec.rb
+- spec/github_cli/commands/issues_spec.rb
 - spec/github_cli/commands/keys_spec.rb
 - spec/github_cli/commands/labels_spec.rb
 - spec/github_cli/commands/milestones_spec.rb
@@ -281,7 +282,9 @@ files:
 - spec/github_cli/commands/repositories_spec.rb
 - spec/github_cli/commands/starring_spec.rb
 - spec/github_cli/commands/tags_spec.rb
+- spec/github_cli/commands/teams_spec.rb
 - spec/github_cli/commands/trees_spec.rb
+- spec/github_cli/commands/users_spec.rb
 - spec/github_cli/commands/watching_spec.rb
 - spec/github_cli/config_spec.rb
 - spec/github_cli/helpers_spec.rb
@@ -373,6 +376,7 @@ test_files:
 - spec/github_cli/commands/events_spec.rb
 - spec/github_cli/commands/followers_spec.rb
 - spec/github_cli/commands/gists_spec.rb
+- spec/github_cli/commands/issues_spec.rb
 - spec/github_cli/commands/keys_spec.rb
 - spec/github_cli/commands/labels_spec.rb
 - spec/github_cli/commands/milestones_spec.rb
@@ -381,7 +385,9 @@ test_files:
 - spec/github_cli/commands/repositories_spec.rb
 - spec/github_cli/commands/starring_spec.rb
 - spec/github_cli/commands/tags_spec.rb
+- spec/github_cli/commands/teams_spec.rb
 - spec/github_cli/commands/trees_spec.rb
+- spec/github_cli/commands/users_spec.rb
 - spec/github_cli/commands/watching_spec.rb
 - spec/github_cli/config_spec.rb
 - spec/github_cli/helpers_spec.rb