github_cli 0.5.8 → 0.5.9

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+0.5.9 (April , 2013)
+
+* Change API class configure to take options and allow for basic auth,
+  stop using class api variable
+* Change API commands to take and pass options for global configuration
+
 0.5.8 (April 14, 2013)
 
 * Change forks commands to take specific options and add tests

data/Gemfile.lock

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

data/README.md

@@ -93,7 +93,9 @@ $ gcli help config
 
 ### Authorization
 
-To create oauth tokens you need to setup your basic authentication like so
+To create oauth tokens you need to setup your basic authentication.
+
+You can either set it up manually like so
 
 ```shell
 $ gcli init
@@ -107,12 +109,24 @@ Then to create your token do
 $ gcli auth create --scopes=repo --note=gihtub_cli --note-url=http://github.com/peter-murach/github_cli
 ```
 
+Alternatively `authorize` command has been provided that will guide you through authentication process by asking questions and then save the crednetials to `.githubrc` file. Example
+
+```shell
+$ gcli authorize
+```
+
 To see your current tokens do
 
 ```shell
 $ gcli auth ls
 ```
 
+To see current tokens without configuration file pass `--login` and `--password` flags like so
+
+```shell
+$ gcli auth ls --login=... --password=...
+```
+
 Finally to add the token to your config do
 
 ```shell

data/lib/github_cli/api.rb

@@ -5,58 +5,65 @@ module GithubCLI
   # The API class is the main entry point for creating GithubCLI APIs.
   class API
 
-    @@api = nil
-
     class << self
 
-      attr_reader :config
-
-      def github_api
-        @@api ||= begin
-          @@api = configure_api
+      # Access or initialize Github API client
+      #
+      # @api public
+      def github_api(options={})
+        @github_api ||= begin
+          @github_api = configure(options)
         end
       end
 
-      # see http://stackoverflow.com/questions/5729071/how-to-compose-thor-tasks-in-separate-classes-modules-files
-
       # this could become a command such as configure that gets class options
-
-      def configure_api
-        @@api = Github.new
+      #
+      # @api public
+      def configure(options={})
+        api    = Github.new
         config = GithubCLI.config.data
 
-        if config['user.token']
-          @@api.oauth_token = config['user.token']
-        end
-        if config['user.login'] && config['user.password']
-          @@api.basic_auth = "#{config['user.login']}:#{config['user.password']}"
-        end
-        @@api.endpoint = GithubCLI.config['core.endpoint'] || @@api.endpoint
+        api.oauth_token = config['user.token'] if config['user.token']
+
+        api.basic_auth  = set_basic_auth(config, options)
+
+        api.endpoint    = config['core.endpoint'] if config['core.endpoint']
+
         if ENV['TEST_HOST']
-          @@api.endpoint = 'http://' + ENV['TEST_HOST']
+          api.endpoint = 'http://' + ENV['TEST_HOST']
+        end
+        api
+      end
+
+      # Set user basic authentication
+      #
+      # @api public
+      def set_basic_auth(config, options)
+        if options['login'] && options['password']
+           "#{options['login']}:#{options['password']}"
+        elsif config['user.login'] && config['user.password']
+          "#{config['user.login']}:#{config['user.password']}"
+        else
+          nil
         end
-        @@api
       end
 
-      def output(format=:table, &block)
-        # GithubCLI.on_error do
+      # Procoess response and output to shell
+      # TODO: change to take options
+      # @api public
+      def output(format=:table, quiet=false, &block)
+        GithubCLI.on_error do
           response  = block.call
           if response.respond_to?(:body)
-            formatter = Formatter.new response, :format => format
+            formatter = Formatter.new response, :format => format, :quiet => quiet
             formatter.render_output
           else
             response
           end
-        # end
+        end
       end
 
     end
 
-    class All
-      def initialize(params)
-        puts Github::Repos.new.all params
-      end
-    end
-
   end # API
 end # GithubCLI

data/lib/github_cli/apis/authorization.rb

@@ -5,33 +5,33 @@ module GithubCLI
 
     class << self
 
-      def all(params, format)
-        output format do
-          github_api.oauth.list params
+      def all(params, options)
+        output options[:format], options[:quiet] do
+          github_api(options).oauth.list params
         end
       end
 
-      def get(id, params, format)
-        output format do
-          github_api.oauth.get id, params
+      def get(id, params, options)
+        output options[:format], options[:quiet] do
+          github_api(options).oauth.get id, params
         end
       end
 
-      def create(params, format)
-        output format do
-          github_api.oauth.create params
+      def create(params, options)
+        output options[:format], options[:quiet] do
+          github_api(options).oauth.create params
         end
       end
 
-      def update(id, params, format)
-        output format do
-          github_api.oauth.update id, params
+      def update(id, params, options)
+        output options[:format], options[:quiet] do
+          github_api(options).oauth.update id, params
         end
       end
 
-      def delete(id, params, format)
-        output format do
-          github_api.oauth.delete id, params
+      def delete(id, params, options)
+        output options[:format], options[:quiet] do
+          github_api(options).oauth.delete id, params
         end
       end
     end

data/lib/github_cli/apis/hook.rb

@@ -5,39 +5,39 @@ module GithubCLI
 
     class << self
 
-      def all(user, repo, params, format)
-        output format do
-          github_api.repos.hooks.list user, repo, params
+      def all(user, repo, params, options)
+        output options[:format], options[:quiet] do
+          github_api(options).repos.hooks.list user, repo, params
         end
       end
 
-      def get(user, repo, id, params, format)
-        output format do
-          github_api.repos.hooks.get user, repo, id, params
+      def get(user, repo, id, params, options)
+        output options[:format], options[:quiet] do
+          github_api(options).repos.hooks.get user, repo, id, params
         end
       end
 
-      def create(user, repo, params, format)
-        output format do
-          github_api.repos.hooks.create user, repo, params
+      def create(user, repo, params, options)
+        output options[:format], options[:quiet] do
+          github_api(options).repos.hooks.create user, repo, params
         end
       end
 
-      def edit(user, repo, id, params, format)
-        output format do
-          github_api.repos.hooks.edit user, repo, id, params
+      def edit(user, repo, id, params, options)
+        output options[:format], options[:quiet] do
+          github_api(options).repos.hooks.edit user, repo, id, params
         end
       end
 
-      def test(user, repo, id, params, format)
-        output format do
-          github_api.repos.hooks.test user, repo, id, params
+      def test(user, repo, id, params, options)
+        output options[:format], options[:quiet] do
+          github_api(options).repos.hooks.test user, repo, id, params
         end
       end
 
-      def delete(user, repo, id, params, format)
-        output format do
-          github_api.repos.hooks.delete user, repo, id, params
+      def delete(user, repo, id, params, options)
+        output options[:format], options[:quiet] do
+          github_api(options).repos.hooks.delete user, repo, id, params
         end
       end
     end

data/lib/github_cli/apis/repository.rb

@@ -5,69 +5,69 @@ module GithubCLI
 
     class << self
 
-      def all(params, format)
-        output format do
-          github_api.repos.list params
+      def all(params, options)
+        output options[:format], options[:quiet] do
+          github_api(options).repos.list params
         end
       end
 
-      def get(user, repo, params, format)
-        output format do
-          github_api.repos.get user, repo, params
+      def get(user, repo, params, options)
+        output options[:format], options[:quiet] do
+          github_api(options).repos.get user, repo, params
         end
       end
 
-      def create(params, format)
-        output format do
-          github_api.repos.create params
+      def create(params, options)
+        output options[:format], options[:quiet] do
+          github_api(options).repos.create params
         end
       end
 
-      def edit(user, repo, params, format)
-        output format do
-          github_api.repos.edit user, repo, params
+      def edit(user, repo, params, options)
+        output options[:format], options[:quiet] do
+          github_api(options).repos.edit user, repo, params
         end
       end
 
-      def delete(user, repo, params, format)
-        output format do
-          github_api.repos.delete user, repo, params
+      def delete(user, repo, params, options)
+        output options[:format], options[:quiet] do
+          github_api(options).repos.delete user, repo, params
         end
       end
 
-      def branches(user, repo, params, format)
-        output format do
-          github_api.repos.branches user, repo, params
+      def branches(user, repo, params, options)
+        output options[:format], options[:quiet] do
+          github_api(options).repos.branches user, repo, params
         end
       end
 
-      def branch(user, repo, name, params, format)
-        output format do
-          github_api.repos.branch user, repo, name, params
+      def branch(user, repo, name, params, options)
+        output options[:format], options[:quiet] do
+          github_api(options).repos.branch user, repo, name, params
         end
       end
 
-      def contributors(user, repo, params, format)
-        output format do
-          github_api.repos.contributors user, repo, params
+      def contributors(user, repo, params, options)
+        output options[:format], options[:quiet] do
+          github_api(options).repos.contributors user, repo, params
         end
       end
 
-      def languages(user, repo, params, format)
-        output format do
-          github_api.repos.languages user, repo, params
+      def languages(user, repo, params, options)
+        output options[:format], options[:quiet] do
+          github_api(options).repos.languages user, repo, params
         end
       end
 
-      def tags(user, repo, params, format)
-        output format do
+      def tags(user, repo, params, options)
+        output options[:format], options[:quiet] do
           github_api.repos.tags user, repo, params
         end
       end
 
-      def teams(user, repo, params, format)
-        output format do
-          github_api.repos.teams user, repo, params
+      def teams(user, repo, params, options)
+        output options[:format], options[:quiet] do
+          github_api(options).repos.teams user, repo, params
         end
       end
     end

data/lib/github_cli/cli.rb

@@ -24,6 +24,8 @@ module GithubCLI
 
     map ALIASES
 
+    # can extract class options into global options module
+
     class_option :filename, :type => :string,
                  :desc => "Configuration file name.", :banner => "<filename>",
                  :default => ".githubrc"
@@ -39,6 +41,8 @@ module GithubCLI
     class_option :pager, :type => :string, :aliases => '-p',
                  :desc => "Command to be used for paging.",
                  :banner => "less|more|..."
+    class_option :quiet, :type => :boolean, :aliases => "-q",
+                 :desc => "Suppress response output"
     class_option :verbose, :type => :boolean,
                  :desc => "Enable verbose output mode."
     class_option :version, :type => :boolean, :aliases => ['-V'],
@@ -79,12 +83,23 @@ module GithubCLI
       You may use this command to change your details.
     DESC
     def authorize
+      global_options = options.dup
       params = {}
-      params['scopes'] = options[:scopes] || %w(public_repo repo)
-      params['note']   = options[:note] || 'github_cli'
+      params['scopes']   = options[:scopes] || %w(public_repo repo)
+      params['note']     = options[:note] || 'github_cli'
       params['note_url'] = options[:note_url] || 'https://github.com/peter-murach/github_cli'
+      global_options[:params] = params
       # Need to configure client with login and password
-      res = self.invoke("auth:create", [], params)
+      print 'OPTIONS '
+      p options
+      login = ask("login: ")
+      password = ask("password: ")
+
+      global_options['login'] = login
+      global_options['password'] = password
+      global_options['quiet'] = true
+
+      res   = self.invoke("auth:create", [], global_options)
       token = res.body['token']
 
       config = GithubCLI.config

data/lib/github_cli/command.rb

@@ -39,24 +39,17 @@ module GithubCLI
     }
     map ALIASES
 
-    class_option :params, :type => :hash, :default => {}, :aliases => '-p',
-                 :desc => 'Request parameters e.i per_page:100'
-
     class_option :format, :type => :string, :aliases => '-f',
                  :default => 'table',
                  :banner => output_formats.keys.join('|'),
                  :desc => "Format of the output. Type table:h to display table horizontally."
+    class_option :quiet, :type => :boolean, :aliases => "-q",
+                 :desc => "Suppress response output"
 
-    class << self
+    class_option :params, :type => :hash, :default => {}, :aliases => '-p',
+                 :desc => 'Request parameters e.i per_page:100'
 
-      def api(name=nil)
-        @api = case name
-        when nil
-          @api || GithubCLI.const_get(name.to_s.capitalize)
-        else
-          @pi
-        end
-      end
+    class << self
 
       def banner(task, namespace=true, subcommand=true)
         "#{basename} #{task.formatted_usage(self, true, subcommand)}"

data/lib/github_cli/commands/authorizations.rb

@@ -10,7 +10,10 @@ module GithubCLI
       You can only list your own tokens, and only through Basic Authentication.
     DESC
     def list
-      Authorization.all options[:params], options[:format]
+      global_options = options.dup
+      params = global_options[:params].dup
+      Util.hash_without!(global_options, %w[ params ])
+      Authorization.all params, global_options
     end
 
     desc 'get <id>', 'Get a single authorization'
@@ -18,7 +21,10 @@ module GithubCLI
       You can only access your own token, and only through Basic Authentication.
     DESC
     def get(id)
-      Authorization.get id, options[:params], options[:format]
+      global_options = options.dup
+      params = global_options[:params].dup
+      Util.hash_without!(global_options, %w[ params ])
+      Authorization.get id, params, global_options
     end
 
     desc 'create', 'Create a new authorization'
@@ -38,11 +44,15 @@ module GithubCLI
       note_url - Optional string - A URL to remind you what the OAuth token is for.
     DESC
     def create
-      params = options[:params].dup
+      global_options     = options.dup
+      params             = global_options[:params].dup
       params['scopes']   = options[:scopes]   if options[:scopes]
       params['note']     = options[:note]     if options[:note]
       params['note_url'] = options[:note_url] if options[:note_url]
-      Authorization.create params, options[:format]
+
+      Util.hash_without!(global_options, %w[ params scopes note note_url])
+
+      Authorization.create params, global_options
     end
 
     desc 'update <id>', 'Update an existing authorization'
@@ -66,18 +76,26 @@ module GithubCLI
       note_url - Optional string - A URL to remind you what the OAuth token is for.
     DESC
     def update(id)
-      params = options[:params].dup
+      global_options = options.dup
+      params = global_options[:params].dup
       params['scopes']        = options[:scopes]        if options[:scopes]
       params['add_scopes']    = options[:add_scopes]    if options[:add_scopes]
       params['remove_scopes'] = options[:remove_scopes] if options[:remove_scopes]
       params['note']          = options[:note]          if options[:note]
       params['note_url']      = options[:note_url]      if options[:note_url]
-      Authorization.update id, params, options[:format]
+
+      Util.hash_without!(global_options,
+        %w[ params scopes add_scopes remove_scopes note note_url])
+
+      Authorization.update id, params, global_options
     end
 
     desc 'delete <id>', 'Delete an authorization'
     def delete(id)
-      Authorization.delete id, options[:params], options[:format]
+      global_options = options.dup
+      params = global_options[:params].dup
+      Util.hash_without!(global_options, %w[ params ])
+      Authorization.delete id, params, global_options
     end
 
   end # Authorizations

data/lib/github_cli/commands/hooks.rb

@@ -7,12 +7,18 @@ module GithubCLI
 
     desc 'list <user> <repo>', 'List repository hooks'
     def list(user, repo)
-      Hook.all user, repo, options[:params], options[:format]
+      global_options = options.dup
+      params = options[:params].dup
+      Util.hash_without!(global_options, %w[ params ])
+      Hook.all user, repo, params, global_options
     end
 
     desc 'get <user> <repo> <id>', 'Get a hook'
     def get(user, repo, id)
-      Hook.get user, repo, id, options[:params], options[:format]
+      global_options = options.dup
+      params = options[:params].dup
+      Util.hash_without!(global_options, %w[ params ])
+      Hook.get user, repo, id, params, global_options
     end
 
     option :name, :type => :string, :required => true, :banner => "service",
@@ -33,13 +39,14 @@ module GithubCLI
       active - Optional boolean - Determines whether the hook is actually triggered on pushes.
     DESC
     def create(user, repo)
+      global_options = options.dup
       params = options[:params].dup
       params['name']   = options[:name]
       params['config'] = options[:config]
       params['events'] = options[:events] if options[:events]
       params['active'] = options[:active] if options[:active]
-
-      Hook.create user, repo, params, options[:format]
+      Util.hash_without!(global_options, %w[ params name config events active ])
+      Hook.create user, repo, params, global_options
     end
 
     option :name, :type => :string, :required => true, :banner => "service",
@@ -66,6 +73,7 @@ module GithubCLI
       active - Optional boolean - Determines whether the hook is actually triggered on pushes. \n
     DESC
     def edit(user, repo, id)
+      global_options = options.dup
       params = options[:params].dup
       params['name']          = options[:name]
       params['config']        = options[:config]
@@ -73,18 +81,24 @@ module GithubCLI
       params['add_events']    = options[:add_events]    if options[:add_events]
       params['remove_events'] = options[:remove_events] if options[:remove_events]
       params['active']        = options[:active]        if options[:active]
-
-      Hook.edit user, repo, id, params, options[:format]
+      Util.hash_without!(global_options, %w[ params name config events add_events remove_events active ])
+      Hook.edit user, repo, id, params, global_options
     end
 
     desc 'test <user> <repo> <id>', 'Test a hook'
     def test(user, repo, id)
-      Hook.test user, repo, id, options[:params], options[:format]
+      global_options = options.dup
+      params = options[:params].dup
+      Util.hash_without!(global_options, %w[ params ])
+      Hook.test user, repo, id, params, global_options
     end
 
     desc 'delete <user> <repo> <id>', 'Delete a hook'
     def delete(user, repo, id)
-      Hook.delete user, repo, id, options[:params], options[:format]
+      global_options = options.dup
+      params = options[:params].dup
+      Util.hash_without!(global_options, %w[ params ])
+      Hook.delete user, repo, id, params, global_options
     end
 
   end # Hooks

data/lib/github_cli/commands/repositories.rb

@@ -19,6 +19,7 @@ module GithubCLI
            :desc => "asc or desc, default: when using full_name: asc, otherwise desc."
     desc 'list', 'Lists all repositories for the authenticated user'
     def list
+      global_options = options.dup
       params = options[:params].dup
       params['org']   = options[:org] if options[:org]
       params['user']  = options[:user] if options[:user]
@@ -26,12 +27,16 @@ module GithubCLI
       params['type']  = options[:type] if options[:type]
       params['sort']  = options[:sort] if options[:sort]
       params['direction'] = options[:direction] if options[:direction]
-      Repository.all params, options[:format]
+      Util.hash_without!(global_options, params.keys + ['params'])
+      Repository.all params, global_options
     end
 
     desc 'get <user> <repo>', 'Get a repository'
     def get(user, repo)
-      Repository.get user, repo, options[:params], options[:format]
+      global_options = options.dup
+      params = options[:params].dup
+      Util.hash_without!(global_options, %w[ params ])
+      Repository.get user, repo, params, global_options
     end
 
     option :org, :type => :string, :aliases => ["-o"],
@@ -39,17 +44,18 @@ module GithubCLI
            :banner => '<organization>'
     option :desc, :type => :string, :banner => "description"
     option :home, :type => :string, :banner => "homepage"
-    option :private, :type => :boolean,
+    option :private, :type => :boolean, :default => false,
            :desc => "true to create a private repository, false to create a public one"
-    option :issues, :type => :boolean, :banner => "has_issues",
+    option :issues, :type => :boolean, :banner => "has_issues", :default => true,
            :desc => "true to enable issues for this repository, false to disable them"
-    option :wiki, :type => :boolean, :banner => "has_wiki",
+    option :wiki, :type => :boolean, :banner => "has_wiki", :default => true,
            :desc => "true to enable the wiki for this repository, false to disable it. Default is true"
     option :downloads, :type => :boolean, :banner => "has_downloads",
+           :default => true,
            :desc => "true to enable downloads for this repository "
-    option :team, :type => :string, :banner => "team <id>",
+    option :team, :type => :numeric, :banner => "team <id>",
            :desc => "The id of the team that will be granted access to this repository. This is only valid when creating a repo in an organization"
-    option :auto, :type => :string, :banner => "auto_init",
+    option :auto, :type => :string, :banner => "auto_init", :default => false,
            :desc => "true to create an initial commit with empty README. Default is false."
     option :gitignore, :type => :string, :banner => "gitignore_template",
            :desc => "Desired language or platform .gitignore template to apply."
@@ -71,32 +77,36 @@ module GithubCLI
         gitignore_template - Optional string - Desired language or platform .gitignore template to apply. Use the name of the template without the extension. For example, “Haskell” Ignored if auto_init parameter is not provided.
     DESC
     def create(args)
+      global_options = options.dup
       params = options[:params].dup
       org, params['name'] = Arguments.new(args).parse
-      params['org'] = org if org
-      params['org'] = options[:org] if options[:org]
-      params['description'] = options[:desc] if options[:desc]
-      params['homepage'] = options[:home] if options[:home]
-      params['private'] = options[:private] if options[:private]
-      params['has_issues'] = options[:issues] if options[:issues]
-      params['has_wiki'] = options[:wiki] if options[:wiki]
-      params['has_downloads'] = options[:downloads] if options[:downloads]
-      params['team_id'] = options[:team] if options[:team]
-      params['auto_init'] = options[:auto] if options[:auto]
+      params['org']                = org if org
+      params['org']                = options[:org]       if options[:org]
+      params['description']        = options[:desc]      if options[:desc]
+      params['homepage']           = options[:home]      if options[:home]
+      params['private']            = options[:private]
+      params['has_issues']         = options[:issues]
+      params['has_wiki']           = options[:wiki]
+      params['has_downloads']      = options[:downloads]
+      params['team_id']            = options[:team]      if options[:team]
+      params['auto_init']          = options[:auto]
       params['gitignore_template'] = options[:gitignore] if options[:gitignore]
 
-      Repository.create params, options[:format]
+      Util.hash_without!(global_options,
+        params.keys + %w[ params issues wiki downloads team auto gitignore ])
+      Repository.create params, global_options
     end
 
     option :desc, :type => :string, :banner => "description"
     option :home, :type => :string, :banner => "homepage"
-    option :private, :type => :boolean,
+    option :private, :type => :boolean, :default => false,
            :desc => "true to create a private repository, false to create a public one"
-    option :issues, :type => :boolean, :banner => "has_issues",
+    option :issues, :type => :boolean, :banner => "has_issues", :default => true,
            :desc => "true to enable issues for this repository, false to disable them"
-    option :wiki, :type => :boolean, :banner => "has_wiki",
+    option :wiki, :type => :boolean, :banner => "has_wiki", :default => true,
            :desc => "true to enable the wiki for this repository, false to disable it. Default is true"
     option :downloads, :type => :boolean, :banner => "has_downloads",
+           :default => true,
            :desc => "true to enable downloads for this repository "
     option :branch, :type => :string, :banner => "default branch",
            :desc => "Update the default branch for this repository."
@@ -116,52 +126,76 @@ module GithubCLI
         default_branch - Optional string - update the default branch for this repository \n
     DESC
     def edit(user, repo, name)
+      global_options = options.dup
       params = options[:params].dup
       params['name'] = name
-      params['description'] = options[:desc] if options[:desc]
-      params['homepage'] = options[:home] if options[:home]
-      params['private'] = options[:private] if options[:private]
-      params['has_issues'] = options[:issues] if options[:issues]
-      params['has_wiki'] = options[:wiki] if options[:wiki]
-      params['has_downloads'] = options[:downloads] if options[:downloads]
-      params['default_branch'] = options[:branch] if options[:branch]
-
-      Repository.edit user, repo, params, options[:format]
+      params['description']    = options[:desc]      if options[:desc]
+      params['homepage']       = options[:home]      if options[:home]
+      params['private']        = options[:private]
+      params['has_issues']     = options[:issues]
+      params['has_wiki']       = options[:wiki]
+      params['has_downloads']  = options[:downloads]
+      params['default_branch'] = options[:branch]    if options[:branch]
+
+      Util.hash_without!(global_options,
+        params.keys + %w[ wiki issues downloads params] )
+      Repository.edit user, repo, params, global_options
     end
 
     desc 'delete <user> <repo>', 'Delete a repository'
     def delete(user, repo)
-      Repository.delete user, repo, options[:params], options[:format]
+      global_options = options.dup
+      params = options[:params].dup
+      Util.hash_without!(global_options, params.keys + ['params'])
+      Repository.delete user, repo, params, global_options
     end
 
     desc 'branches <user> <repo>', 'List branches'
     def branches(user, repo)
-      Repository.branches user, repo, options[:params], options[:format]
+      global_options = options.dup
+      params = options[:params].dup
+      Util.hash_without!(global_options, params.keys + ['params'])
+      Repository.branches user, repo, params, global_options
     end
 
     desc 'branch <user> <repo> <name>', 'Get branch'
     def branch(user, repo, name)
-      Repository.branch user, repo, name, options[:params], options[:format]
+      global_options = options.dup
+      params = options[:params].dup
+      Util.hash_without!(global_options, params.keys + ['params'])
+      Repository.branch user, repo, name, params, global_options
     end
 
     desc 'contribs <user> <repo>', 'List contributors'
     def contribs(user, repo)
-      Repository.contributors user, repo, options[:params], options[:format]
+      global_options = options.dup
+      params = options[:params].dup
+      Util.hash_without!(global_options, params.keys + ['params'])
+      Repository.contributors user, repo, params, global_options
     end
 
     desc 'langs <user> <repo>', 'Listing all languages'
     def langs(user, repo)
-      Repository.languages user, repo, options[:params], options[:format]
+      global_options = options.dup
+      params = options[:params].dup
+      Util.hash_without!(global_options, params.keys + ['params'])
+      Repository.languages user, repo, params, global_options
     end
 
     desc 'tags <user> <repo>', 'Listing all tags'
     def tags(user, repo)
-      Repository.tags user, repo, options[:params], options[:format]
+      global_options = options.dup
+      params = options[:params].dup
+      Util.hash_without!(global_options, params.keys + ['params'])
+      Repository.tags user, repo, params, global_options
     end
 
     desc 'teams <user> <repo>', 'Listing all teams'
     def teams(user, repo)
-      Repository.teams user, repo, options[:params], options[:format]
+      global_options = options.dup
+      params = options[:params].dup
+      Util.hash_without!(global_options, params.keys + ['params'])
+      Repository.teams user, repo, params, global_options
     end
 
   end # Repositories

data/lib/github_cli/formatter.rb

@@ -5,16 +5,18 @@ module GithubCLI
   # It delegates to other objects like Formatter::Table
   # to perform actual rendering.
   class Formatter
-    attr_reader :response, :format, :message
+    attr_reader :response, :format, :message, :quiet
 
     def initialize(response, options={})
       @response = response
       @message  = options[:message]
       @format   = options[:format]
+      @quiet    = options[:quiet]
     end
 
     def render_output
       render_status
+      return if quiet
       Terminal.paged_output
       determine_output_formatter
       render_message

data/lib/github_cli/util.rb

@@ -20,6 +20,10 @@ module GithubCLI
       return new_hash
     end
 
+    def hash_without!(hash, keys)
+      hash.reject! { |key| keys.include?(key) }
+    end
+
     def convert_values(values)
       values_copy = values.dup
       collected = []

data/lib/github_cli/version.rb

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

data/spec/github_cli/commands/authorizations_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe GithubCLI::Commands::Authorizations do
-  let(:format) { 'table' }
+  let(:format) { {'format' => 'table'} }
   let(:id) { 1 }
   let(:api_class) { GithubCLI::Authorization }
 

data/spec/github_cli/commands/hooks_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe GithubCLI::Commands::Hooks do
-  let(:format) { 'table' }
+  let(:format) { {'format' => 'table'} }
   let(:user)   { 'peter-murach' }
   let(:repo)   { 'github_cli' }
   let(:id)     { 1 }

data/spec/github_cli/commands/repositories_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe GithubCLI::Commands::Repositories do
-  let(:format) { 'table' }
+  let(:format) { {'format' => 'table'} }
   let(:user)   { 'peter-murach' }
   let(:repo)   { 'github_cli' }
   let(:org)    { 'rails' }
@@ -37,34 +37,44 @@ describe GithubCLI::Commands::Repositories do
   end
 
   it "invokes repo:create name" do
-    api_class.should_receive(:create).with({'name' => repo}, format)
+    api_class.should_receive(:create).with({
+      'name' => repo, 'private' => nil, 'has_issues' => nil,
+      'has_wiki' => nil, 'has_downloads' => nil, 'auto_init' => nil}, format)
     subject.invoke "repo:create", [repo]
   end
 
   it "invokes repo:create org/name" do
-    api_class.should_receive(:create).with({'name' => repo, 'org' => org}, format)
+    api_class.should_receive(:create).with({
+      'name' => repo, 'org' => org, 'private' => nil, 'has_issues' => nil,
+      'has_wiki' => nil, 'has_downloads' => nil, 'auto_init' => nil}, format)
     subject.invoke "repo:create", ["#{org}/#{repo}"]
   end
 
   it "invokes repo:create name --org" do
-    api_class.should_receive(:create).with({'name' => repo, 'org' => org}, format)
+    api_class.should_receive(:create).with({
+      'name' => repo, 'org' => org, 'private' => nil, 'has_issues' => nil,
+      'has_wiki' => nil, 'has_downloads' => nil, 'auto_init' => nil}, format)
     subject.invoke "repo:create", [repo], :org => org
   end
 
   it "invokes repo:create name --wiki --issues --downloads --auto_init" do
-    api_class.should_receive(:create).with({'name' => repo, "has_wiki" => true,
+    api_class.should_receive(:create).with({
+     'name' => repo, "has_wiki" => true, 'private' => nil,
       "has_issues" => true, "has_downloads" => true, "auto_init" => true}, format)
     subject.invoke "repo:create", [repo], :wiki => true, :issues => true,
       :downloads => true, :auto => true
   end
 
   it "invokes repo:edit user repo name" do
-    api_class.should_receive(:edit).with(user, repo, {'name' => 'new'}, format)
+    api_class.should_receive(:edit).with(user, repo, {
+      'name' => 'new', 'private' => nil,
+      "has_wiki" => nil, "has_issues" => nil, "has_downloads" => nil}, format)
     subject.invoke "repo:edit", [user, repo, 'new']
   end
 
   it "invokes repo:edit user repo name --wiki --issues --downloads --auto_init" do
-    api_class.should_receive(:edit).with(user, repo, {'name' => 'new',
+    api_class.should_receive(:edit).with(user, repo, {
+      'name' => 'new', 'private' => nil,
       "has_wiki" => true, "has_issues" => true, "has_downloads" => true}, format)
     subject.invoke "repo:edit", [user, repo, 'new'], :wiki => true,
       :issues => true, :downloads => true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: github_cli
 version: !ruby/object:Gem::Version
-  version: 0.5.8
+  version: 0.5.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-14 00:00:00.000000000Z
+date: 2013-04-17 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: github_api
-  requirement: &2153460920 !ruby/object:Gem::Requirement
+  requirement: &2160827640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '0.9'
   type: :runtime
   prerelease: false
-  version_requirements: *2153460920
+  version_requirements: *2160827640
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153460520 !ruby/object:Gem::Requirement
+  requirement: &2160826680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153460520
+  version_requirements: *2160826680
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &2153459940 !ruby/object:Gem::Requirement
+  requirement: &2160823300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153459940
+  version_requirements: *2160823300
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2153459420 !ruby/object:Gem::Requirement
+  requirement: &2160822640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153459420
+  version_requirements: *2160822640
 - !ruby/object:Gem::Dependency
   name: communist
-  requirement: &2153458960 !ruby/object:Gem::Requirement
+  requirement: &2160822040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153458960
+  version_requirements: *2160822040
 - !ruby/object:Gem::Dependency
   name: ronn
-  requirement: &2153458380 !ruby/object:Gem::Requirement
+  requirement: &2160821340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153458380
+  version_requirements: *2160821340
 description: CLI-based access to GitHub API v3
 email:
 - ''