github_cli 0.5.9 → 0.6.0

data/lib/github_cli/apis/team.rb

@@ -5,81 +5,81 @@ module GithubCLI
 
     class << self
 
-      def all(org, params, format)
-        output format do
-          github_api.orgs.teams.list org, params
+      def all(org, params, options)
+        output options do
+          github_api(options).orgs.teams.list org, params
         end
       end
 
-      def get(id, params, format)
-        output format do
-          github_api.orgs.teams.get id, params
+      def get(id, params, options)
+        output options do
+          github_api(options).orgs.teams.get id, params
         end
       end
 
-      def create(org, params, format)
-        output format do
-          github_api.orgs.teams.create org, params
+      def create(org, params, options)
+        output options do
+          github_api(options).orgs.teams.create org, params
         end
       end
 
-      def edit(id, params, format)
-        output format do
-          github_api.orgs.teams.edit id, params
+      def edit(id, params, options)
+        output options do
+          github_api(options).orgs.teams.edit id, params
         end
       end
 
-      def delete(id, params, format)
-        output format do
-          github_api.orgs.teams.delete id, params
+      def delete(id, params, options)
+        output options do
+          github_api(options).orgs.teams.delete id, params
         end
       end
 
-      def all_member(id, params, format)
-        output format do
-          github_api.orgs.teams.list_members id, params
+      def all_member(id, params, options)
+        output options do
+          github_api(options).orgs.teams.list_members id, params
         end
       end
 
-      def member(id, user, params, format)
-        output format do
-          github_api.orgs.teams.team_member? id, user, params
+      def member(id, user, params, options)
+        output options do
+          github_api(options).orgs.teams.team_member? id, user, params
         end
       end
 
-      def add_member(id, user, params, format)
-        output format do
-          github_api.orgs.teams.add_member id, user, params
+      def add_member(id, user, params, options)
+        output options do
+          github_api(options).orgs.teams.add_member id, user, params
         end
       end
 
-      def remove_member(id, user, params, format)
-        output format do
-          github_api.orgs.teams.remove_member id, user, params
+      def remove_member(id, user, params, options)
+        output options do
+          github_api(options).orgs.teams.remove_member id, user, params
         end
       end
 
-      def all_repo(id, params, format)
-        output format do
-          github_api.orgs.teams.list_repos id, params
+      def all_repo(id, params, options)
+        output options do
+          github_api(options).orgs.teams.list_repos id, params
         end
       end
 
-      def repo(id, user, repo, params, format)
-        output format do
-          github_api.orgs.teams.team_repo? id, user, repo, params
+      def repo(id, user, repo, params, options)
+        output options do
+          github_api(options).orgs.teams.team_repo? id, user, repo, params
         end
       end
 
-      def add_repo(id, user, repo, params, format)
-        output format do
-          github_api.orgs.teams.add_repo id, user, repo, params
+      def add_repo(id, user, repo, params, options)
+        output options do
+          github_api(options).orgs.teams.add_repo id, user, repo, params
         end
       end
 
-      def remove_repo(id, user, repo, params, format)
-        output format do
-          github_api.orgs.teams.remove_repo id, user, repo, params
+      def remove_repo(id, user, repo, params, options)
+        output options do
+          github_api(options).orgs.teams.remove_repo id, user, repo, params
         end
       end
     end

data/lib/github_cli/apis/tree.rb

@@ -5,15 +5,15 @@ module GithubCLI
 
     class << self
 
-      def get(user, repo, sha, params, format)
-        output format do
-          github_api.git_data.trees.get user, repo, sha, params
+      def get(user, repo, sha, params, options)
+        output options do
+          github_api(options).git_data.trees.get user, repo, sha, params
         end
       end
 
-      def create(user, repo, params, format)
-        output format do
-          github_api.git_data.trees.create user, repo, params
+      def create(user, repo, params, options)
+        output options do
+          github_api(options).git_data.trees.create user, repo, params
         end
       end
     end

data/lib/github_cli/apis/user.rb

@@ -5,21 +5,21 @@ module GithubCLI
 
     class << self
 
-      def all(params, format)
-        output format do
-          github_api.users.all params
+      def all(params, options)
+        output options do
+          github_api(options).users.all params
         end
       end
 
-      def get(params, format)
-        output format do
-          github_api.users.get params
+      def get(params, options)
+        output options do
+          github_api(options).users.get params
         end
       end
 
-      def update(params, format)
-        output format do
-          github_api.users.update params
+      def update(params, options)
+        output options do
+          github_api(options).users.update params
         end
       end
     end

data/lib/github_cli/apis/watching.rb

@@ -5,33 +5,33 @@ module GithubCLI
 
     class << self
 
-      def list(user, repo, params, format)
-        output format do
-          github_api.activity.watching.list user, repo, params
+      def list(user, repo, params, options)
+        output options do
+          github_api(options).activity.watching.list user, repo, params
         end
       end
 
-      def watched(params, format)
-        output format do
-          github_api.activity.watching.watched params
+      def watched(params, options)
+        output options do
+          github_api(options).activity.watching.watched params
         end
       end
 
-      def watching?(user, repo, params, format)
-        output format do
-          github_api.activity.watching.watching? user, repo, params
+      def watching?(user, repo, params, options)
+        output options do
+          github_api(options).activity.watching.watching? user, repo, params
         end
       end
 
-      def start(user, repo, params, format)
-        output format do
-          github_api.activity.watching.watch user, repo, params
+      def start(user, repo, params, options)
+        output options do
+          github_api(options).activity.watching.watch user, repo, params
         end
       end
 
-      def stop(user, repo, params, format)
-        output format do
-          github_api.activity.watching.unwatch user, repo, params
+      def stop(user, repo, params, options)
+        output options do
+          github_api(options).activity.watching.unwatch user, repo, params
         end
       end
     end

data/lib/github_cli/cli.rb

@@ -1,6 +1,8 @@
 # encoding: utf-8
 
 module GithubCLI
+
+  # Main command line interface
   class CLI < Thor
     include Thor::Actions
     require 'github_cli/subcommands'
@@ -58,6 +60,7 @@ module GithubCLI
           'user.repo'     => nil,
           'user.org'      => nil,
           'core.adapter'  => :net_http,
+          'core.site'     => 'https://github.com',
           'core.endpoint' => 'https://api.github.com',
           'core.ssl'      => nil,
           'core.mime'     => :json,
@@ -65,7 +68,8 @@ module GithubCLI
           'core.pager'    => 'less',
           'core.no-pager' => false,
           'core.no-color' => false,
-          'core.format'   => 'table',
+          'core.quiet'    => false,
+          'core.format'   => :table,
           'core.auto_pagination' => false,
           'core.aliases'  => nil,
         }
@@ -74,6 +78,12 @@ module GithubCLI
 
     option :local, :type => :boolean, :default => false, :aliases => "-l",
            :desc => 'Modify local configuration file, otherwise a global configuration file is changed.'
+    option :scopes, :type => :array, :banner => "user public_repo repo...",
+      :desc => "A list of scopes that this authorization is in."
+    option :note, :type => :string,
+      :desc => "A note to remind you what the OAuth token is for."
+    option :note_url, :type => :string,
+      :desc => "A URL to remind you what the OAuth token is for."
     desc 'authorize', 'Add user authentication token'
     long_desc <<-DESC
       Create authorization token for a user named <username> Save user credentials to the .githubrc file.\n
@@ -90,14 +100,12 @@ module GithubCLI
       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
-      print 'OPTIONS '
-      p options
       login = ask("login: ")
       password = ask("password: ")
 
-      global_options['login'] = login
+      global_options['login']    = login
       global_options['password'] = password
-      global_options['quiet'] = true
+      global_options['quiet']    = options[:quiet]
 
       res   = self.invoke("auth:create", [], global_options)
       token = res.body['token']
@@ -109,7 +117,7 @@ module GithubCLI
       config['user.token']    = token
 
       GithubCLI.ui.warn <<-EOF
-        Your #{GithubCLI.config.location} has been overwritten!
+        Your #{GithubCLI.config.location} configuration file has been overwritten!
       EOF
     end
 
@@ -120,6 +128,10 @@ module GithubCLI
       GithubCLI.ui.info me
     end
 
+    option :force, :type => :boolean, :default => false, :aliases => "-f",
+           :banner => "Overwrite configuration file. "
+    option :local, :type => :boolean, :default => false, :aliases => "-l",
+           :desc => 'Create local configuration file, otherwise a global configuration file in user home is created.'
     desc 'init', 'Create a configuration file or overwirte existing one'
     long_desc <<-DESC
       Initializes a configuration file where you can set default options for
@@ -129,10 +141,6 @@ module GithubCLI
       override the bult-in defaults and allow you to save typing commonly  used
       command line options.
     DESC
-    option :force, :type => :boolean, :default => false, :aliases => "-f",
-           :banner => "Overwrite configuration file. "
-    option :local, :type => :boolean, :default => false, :aliases => "-l",
-           :desc => 'Create local configuration file, otherwise a global configuration file in user home is created.'
     def init(filename=nil)
       config_filename = filename ? filename : options[:filename]
       config = GithubCLI.config
@@ -148,6 +156,12 @@ module GithubCLI
       GithubCLI.ui.confirm "Writing new configuration file to #{GithubCLI.config.path}"
     end
 
+    option :local, :type => :boolean, :default => false,
+           :desc => 'use local config file'
+    option :list, :type => :boolean, :default => false, :aliases => '-l',
+           :desc => 'list all'
+    option :edit, :type => :boolean, :default => false, :aliases => '-e',
+           :desc => 'opens an editor'
     desc 'config', 'Get and set GitHub configuration options'
     long_desc <<-DESC
       You can query/set options with this command. The name is actually a hash key
@@ -158,12 +172,6 @@ module GithubCLI
       There two types of config files, global and project specific. When modifying
       options ensure that you modifying the correct config.
     DESC
-    option :local, :type => :boolean, :default => false,
-           :desc => 'use local config file'
-    option :list, :type => :boolean, :default => false, :aliases => '-l',
-           :desc => 'list all'
-    option :edit, :type => :boolean, :default => false, :aliases => '-e',
-           :desc => 'opens an editor'
     def config(*args)
       name, value = args.shift, args.shift
       GithubCLI.config.location = options[:local] ? 'local' : 'global'

data/lib/github_cli/commands/assignees.rb

@@ -10,12 +10,18 @@ module GithubCLI
       Lists all the available assignees (owner + collaborators) to which issues may be assigned
     DESC
     def list(user, repo)
-      Assignee.all user, repo, options[:params], options[:format]
+      global_options = options.dup
+      params = options[:params].dup
+      Util.hash_without!(global_options, params.keys + ['params'])
+      Assignee.all user, repo, params, global_options
     end
 
     desc 'check <user> <repo> <assignee>', 'Check if <assignee> is assigned to <repo>'
     def check(user, repo, assignee)
-      Assignee.check user, repo, assignee, options[:params], options[:format]
+      global_options = options.dup
+      params = options[:params].dup
+      Util.hash_without!(global_options, params.keys + ['params'])
+      Assignee.check user, repo, assignee, params, global_options
     end
 
   end # Assignees

data/lib/github_cli/commands/authorizations.rb

@@ -11,8 +11,8 @@ module GithubCLI
     DESC
     def list
       global_options = options.dup
-      params = global_options[:params].dup
-      Util.hash_without!(global_options, %w[ params ])
+      params = options[:params].dup
+      Util.hash_without!(global_options, params.keys + ['params'])
       Authorization.all params, global_options
     end
 
@@ -22,8 +22,8 @@ module GithubCLI
     DESC
     def get(id)
       global_options = options.dup
-      params = global_options[:params].dup
-      Util.hash_without!(global_options, %w[ params ])
+      params = options[:params].dup
+      Util.hash_without!(global_options, params.keys + ['params'])
       Authorization.get id, params, global_options
     end
 
@@ -45,12 +45,11 @@ module GithubCLI
     DESC
     def create
       global_options     = options.dup
-      params             = global_options[:params].dup
+      params             = 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]
-
-      Util.hash_without!(global_options, %w[ params scopes note note_url])
+      Util.hash_without!(global_options, params.keys + ['params'])
 
       Authorization.create params, global_options
     end
@@ -77,15 +76,13 @@ module GithubCLI
     DESC
     def update(id)
       global_options = options.dup
-      params = global_options[:params].dup
+      params                  = 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]
-
-      Util.hash_without!(global_options,
-        %w[ params scopes add_scopes remove_scopes note note_url])
+      Util.hash_without!(global_options, params.keys + ['params'])
 
       Authorization.update id, params, global_options
     end
@@ -93,8 +90,8 @@ module GithubCLI
     desc 'delete <id>', 'Delete an authorization'
     def delete(id)
       global_options = options.dup
-      params = global_options[:params].dup
-      Util.hash_without!(global_options, %w[ params ])
+      params         = options[:params].dup
+      Util.hash_without!(global_options, params.keys + ['params'])
       Authorization.delete id, params, global_options
     end
 

data/lib/github_cli/commands/blobs.rb

@@ -7,7 +7,11 @@ module GithubCLI
 
     desc 'get <user> <repo> <sha>', 'Get a Blob'
     def get(user, repo, sha)
-      Blob.get user, repo, sha, options[:params], options[:format]
+      global_options = options.dup
+      params = options[:params].dup
+      Util.hash_without!(global_options, params.keys + ['params'])
+
+      Blob.get user, repo, sha, params, global_options
     end
 
     option :content, :type => :string
@@ -21,11 +25,13 @@ module GithubCLI
         encoding - String containing encoding utf-8 or base64
     DESC
     def create(user, repo)
+      global_options = options.dup
       params = options[:params].dup
-      params['content'] = options[:content] if options[:content]
+      params['content']  = options[:content]  if options[:content]
       params['encoding'] = options[:encoding] if options[:encoding]
+      Util.hash_without!(global_options, params.keys + ['params'])
 
-      Blob.create user, repo, params, options[:format]
+      Blob.create user, repo, params, global_options
     end
 
   end # Blobs

data/lib/github_cli/commands/collaborators.rb

@@ -7,22 +7,34 @@ module GithubCLI
 
     desc 'list <owner> <repo>', 'Lists collaborators'
     def list(owner, repo)
-      Collaborator.all owner, repo, options[:params], options[:format]
+      global_options = options.dup
+      params = options[:params].dup
+      Util.hash_without!(global_options, params.keys + ['params'])
+      Collaborator.all owner, repo, params, global_options
     end
 
     desc 'add <owner> <repo> <user>', 'Add a collaborator'
     def add(owner, repo, user)
-      Collaborator.add owner, repo, user, options[:params], options[:format]
+      global_options = options.dup
+      params = options[:params].dup
+      Util.hash_without!(global_options, params.keys + ['params'])
+      Collaborator.add owner, repo, user, params, global_options
     end
 
     desc 'collab <owner> <repo> <user>', 'Checks if user is a collaborator on a given repo'
     def collab(owner, repo, user)
-      Collaborator.collaborator? owner, repo, user, options[:params], options[:format]
+      global_options = options.dup
+      params = options[:params].dup
+      Util.hash_without!(global_options, params.keys + ['params'])
+      Collaborator.collaborator? owner, repo, user, params, global_options
     end
 
     desc 'remove <owner> <repo> <user>', 'Remove a collaborator'
     def remove(owner, repo, user)
-      Collaborator.remove owner, repo, user, options[:params], options[:format]
+      global_options = options.dup
+      params = options[:params].dup
+      Util.hash_without!(global_options, params.keys + ['params'])
+      Collaborator.remove owner, repo, user, params, global_options
     end
 
   end # Collaborators

data/lib/github_cli/commands/commits.rb

@@ -7,7 +7,10 @@ module GithubCLI
 
     desc 'get <user> <repo> <sha>', 'Get a Commit'
     def get(user, repo, sha)
-      Commit.get user, repo, sha, options[:params], options[:format]
+      global_options = options.dup
+      params = options[:params].dup
+      Util.hash_without!(global_options, params.keys + ['params'])
+      Commit.get user, repo, sha, params, global_options
     end
 
     desc 'create <user> <repo>', 'Create a Commit'
@@ -40,13 +43,15 @@ module GithubCLI
         committer.date - Timestamp of when this commit was committed
     DESC
     def create(user, repo)
+      global_options = options.dup
       params = options[:params].dup
-      params['message']   = options[:message] if options[:message]
-      params['tree']      = options[:tree] if options[:tree]
-      params['parents']   = options[:parents] if options[:parents]
-      params['author']    = options[:author] if options[:author]
+      params['message']   = options[:message]   if options[:message]
+      params['tree']      = options[:tree]      if options[:tree]
+      params['parents']   = options[:parents]   if options[:parents]
+      params['author']    = options[:author]    if options[:author]
       params['committer'] = options[:committer] if options[:committer]
-      Commit.create user, repo, params, options[:format]
+      Util.hash_without!(global_options, params.keys + ['params'])
+      Commit.create user, repo, params, global_options
     end
 
   end # Commit

data/lib/github_cli/commands/contents.rb

@@ -16,10 +16,11 @@ module GithubCLI
       ref - Optional string - The String name of the Commit/Branch/Tag. Defaults to master.
     DESC
     def get(user, repo, path)
+      global_options = options.dup
       params = options[:params].dup
       params['ref'] = options[:ref] if options[:ref]
-
-      Content.get user, repo, path, params, options[:format]
+      Util.hash_without!(global_options, params.keys + ['params'])
+      Content.get user, repo, path, params, global_options
     end
 
     option :ref, :type => :string,
@@ -31,10 +32,11 @@ module GithubCLI
       ref - Optional string - The String name of the Commit/Branch/Tag. Defaults to master.
     DESC
     def readme(user, repo)
+      global_options = options.dup
       params = options[:params].dup
       params['ref'] = options[:ref] if options[:ref]
-
-      Content.readme user, repo, params, options[:format]
+      Util.hash_without!(global_options, params.keys + ['params'])
+      Content.readme user, repo, params, global_options
     end
 
     option :ref, :type => :string,
@@ -56,11 +58,12 @@ module GithubCLI
       ref - Optional string - valid Git reference, defaults to master\n
     DESC
     def archive(user, repo)
+      global_options = options.dup
       params = options[:params].dup
       params['ref'] = options[:ref] if options[:ref]
       params['archive_format'] = options[:archive_format] if options[:archive_format]
-
-      Content.archive user, repo, params, options[:format]
+      Util.hash_without!(global_options, params.keys + ['params'])
+      Content.archive user, repo, params, global_options
     end
 
   end # Contents

data/lib/github_cli/commands/downloads.rb

@@ -7,14 +7,26 @@ module GithubCLI
 
     desc 'list <user> <repo>', 'Lists downloads'
     def list(user, repo)
-      Download.all user, repo, options[:params], options[:format]
+      global_options = options.dup
+      params = options[:params].dup
+      Util.hash_without!(global_options, params.keys + ['params'])
+      Download.all user, repo, params, global_options
     end
 
     desc 'get <user> <repo> <id>', 'Get a download'
     def get(user, repo, id)
-      Download.get user, repo, id, options[:params], options[:format]
+      global_options = options.dup
+      params = options[:params].dup
+      Util.hash_without!(global_options, params.keys + ['params'])
+      Download.get user, repo, id, params, global_options
     end
 
+    option :name, :type => :string, :required => true,
+           :desc => 'name of the file that is being created.'
+    option :size, :type => :numeric, :required => true,
+           :desc => 'size of file in bytes'
+    option :desc, :type => :string
+    option :type, :type => :string
     desc 'create <user> <repo>', 'Create a new download resource'
     long_desc <<-DESC
       Creating a new download is a two step process.
@@ -30,13 +42,20 @@ module GithubCLI
         content_type - Optional string \n
     DESC
     def create(user, repo)
-      Download.create user, repo, options[:params], options[:format]
+      global_options = options.dup
+      params = options[:params].dup
+      params['name'] = options[:name]
+      params['size'] = options[:size]
+      params['descritpion']  = options[:desc] if options[:desc]
+      params['content_type'] = options[:type] if options[:type]
+      Util.hash_without!(global_options, params.keys + ['params'])
+      Download.create user, repo, params, global_options
     end
 
     desc 'upload <resource> <filename>', 'Upload resource to s3'
     long_desc <<-DESC
       Upload a file to Amazon, using the reponse instance from
-      Github::Repos::Downloads#create_download. 
+      Github::Repos::Downloads#create
 
       This can be done by passing the response object
       as an argument to upload method.
@@ -47,12 +66,17 @@ module GithubCLI
         filename - Required filename, a path to a file location. \n
     DESC
     def upload(resource, filename)
-      Download.upload resource, filename, options[:format]
+      global_options = options.dup
+      Util.hash_without!(global_options, ['params'])
+      Download.upload resource, filename, global_options
     end
 
     desc 'delete <user> <repo> <id>', 'Delete a download'
     def delete(user, repo, id)
-      Download.delete user, repo, id, options[:params], options[:format]
+      global_options = options.dup
+      params = options[:params].dup
+      Util.hash_without!(global_options, params.keys + ['params'])
+      Download.delete user, repo, id, params, global_options
     end
 
   end # Downloads