github_cli 0.5.3 → 0.5.4

data/features/tree.feature

@@ -1,5 +1,6 @@
 Feature: gcli tree
 
+  @ci-run
   Scenario: Available commands
 
     When I run `gcli tree`
@@ -14,3 +15,19 @@ Feature: gcli tree
     """
     When I run `gcli tree get wycats thor 827efc6d5`
     Then the exit status should be 0
+
+  Scenario: Get tree recursively
+    Given the GitHub API server:
+    """
+    get('/repos/wycats/thor/git/trees/827efc6d5') { status 200 }
+    """
+    When I run `gcli tree get wycats thor 827efc6d5 --recursive`
+    Then the exit status should be 0
+
+  Scenario: Create tree
+    Given the Github API server:
+    """
+    post('/repos/wycats/thor/git/trees') { status 200 }
+    """
+    When I run `gcli tree create wycats thor --tree='path:file1 mode:00111'`
+    Then the exit status should be 0

data/features/watching.feature

@@ -1,5 +1,6 @@
 Feature: gcli watching
 
+  @ci-run
   Scenario: Available commands
 
     When I run `gcli watch`

data/fixtures/simple_config

@@ -1,9 +1,7 @@
 ---
-auth.token: ad7f9asdf97as98df7as9fd7
-auth.basic: 'login:password'
-core.host:
-core.user:
-core.repo:
+user.token: ad7f9asdf97as98df7as9fd7
+user.login: login
+user.password: password
 commands.issue.list:
   title: 'ticket'
 commands.issue.get:

data/github_cli.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = GithubCLI::VERSION
 
-  gem.add_dependency 'github_api', '~> 0.7'
+  gem.add_dependency 'github_api', '~> 0.9'
 
   gem.add_development_dependency 'rspec'
   gem.add_development_dependency 'aruba'

data/lib/github_cli/api.rb

@@ -1,11 +1,10 @@
 # encoding: utf-8
 
 module GithubCLI
+
   # The API class is the main entry point for creating GithubCLI APIs.
   class API
 
-    ENDPOINT = ''
-
     @@api = nil
 
     class << self
@@ -20,9 +19,15 @@ module GithubCLI
 
       def configure_api
         @@api = Github.new
-        @@api.oauth_token = GithubCLI.config['auth.token']
-        @@api.basic_auth  = GithubCLI.config['auth.basic']
-        @@api.endpoint    = GithubCLI.config['core.endpoint'] || @@api.endpoint
+        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
         if ENV['TEST_HOST']
           @@api.endpoint = 'http://' + ENV['TEST_HOST']
         end
@@ -30,7 +35,7 @@ module GithubCLI
       end
 
       def output(format=:table, &block)
-        response =  block.call
+        response  = block.call
         formatter = Formatter.new response, :format => format
         formatter.render_output
       end

data/lib/github_cli/apis/event.rb

@@ -7,49 +7,49 @@ module GithubCLI
 
       def public(params, format)
         output format do
-          github_api.events.public params
+          github_api.activity.events.public params
         end
       end
 
       def repository(user, repo, params, format)
         output format do
-          github_api.events.repository user, repo, params
+          github_api.activity.events.repository user, repo, params
         end
       end
 
       def issue(user, repo, params, format)
         output format do
-          github_api.events.issue user, repo, params
+          github_api.activity.events.issue user, repo, params
         end
       end
 
       def network(user, repo, params, format)
         output format do
-          github_api.events.network user, repo, params
+          github_api.activity.events.network user, repo, params
         end
       end
 
       def organization(org, params, format)
         output format do
-          github_api.events.organization org, params
+          github_api.activity.events.organization org, params
         end
       end
 
       def received(user, params, format)
         output format do
-          github_api.events.received user, params
+          github_api.activity.events.received user, params
         end
       end
 
       def performed(user, params, format)
         output format do
-          github_api.events.performed user, params
+          github_api.activity.events.performed user, params
         end
       end
 
       def user_org(user, org, params, format)
         output format do
-          github_api.events.user_org user, org, params
+          github_api.activity.events.user_org user, org, params
         end
       end
     end

data/lib/github_cli/apis/label.rb

@@ -35,12 +35,6 @@ module GithubCLI
         end
       end
 
-      def issue(user, repo, issue_id, params, format)
-        output format do
-          github_api.issues.labels.issue user, repo, issue_id, params
-        end
-      end
-
       def add(user, repo, issue_id, *args)
         format, params = args.pop, args.pop
 
@@ -62,12 +56,6 @@ module GithubCLI
           github_api.issues.labels.replace user, repo, issue_id, args.flatten, params
         end
       end
-
-      def milestone(user, repo, number, params, format)
-        output format do
-          github_api.issues.labels.milestone user, repo, number, params
-        end
-      end
     end
 
   end # Label

data/lib/github_cli/apis/starring.rb

@@ -7,31 +7,31 @@ module GithubCLI
 
       def list(user, repo, params, format)
         output format do
-          github_api.repos.starring.list user, repo, params
+          github_api.activity.starring.list user, repo, params
         end
       end
 
       def starred(params, format)
         output format do
-          github_api.repos.starring.starred params
+          github_api.activity.starring.starred params
         end
       end
 
       def starring?(user, repo, params, format)
         output format do
-          github_api.repos.starring.starring? user, repo, params
+          github_api.activity.starring.starring? user, repo, params
         end
       end
 
       def star(user, repo, params, format)
         output format do
-          github_api.repos.starring.star user, repo, params
+          github_api.activity.starring.star user, repo, params
         end
       end
 
       def unstar(user, repo, params, format)
         output format do
-          github_api.repos.starring.unstar user, repo, params
+          github_api.activity.starring.unstar user, repo, params
         end
       end
     end

data/lib/github_cli/apis/watching.rb

@@ -7,31 +7,31 @@ module GithubCLI
 
       def list(user, repo, params, format)
         output format do
-          github_api.repos.watching.list user, repo, params
+          github_api.activity.watching.list user, repo, params
         end
       end
 
       def watched(params, format)
         output format do
-          github_api.repos.watching.watched params
+          github_api.activity.watching.watched params
         end
       end
 
       def watching?(user, repo, params, format)
         output format do
-          github_api.repos.watching.watching? user, repo, params
+          github_api.activity.watching.watching? user, repo, params
         end
       end
 
       def start(user, repo, params, format)
         output format do
-          github_api.repos.watching.watch user, repo, params
+          github_api.activity.watching.watch user, repo, params
         end
       end
 
       def stop(user, repo, params, format)
         output format do
-          github_api.repos.watching.unwatch user, repo, params
+          github_api.activity.watching.unwatch user, repo, params
         end
       end
     end

data/lib/github_cli/cli.rb

@@ -24,8 +24,8 @@ module GithubCLI
 
     map ALIASES
 
-    class_option :config, :type => :string,
-                 :desc => "Configuration file.", :banner => "<filename>",
+    class_option :filename, :type => :string,
+                 :desc => "Configuration file name.", :banner => "<filename>",
                  :default => ".githubrc"
     class_option :token, :type => :string,
                  :desc => 'Authentication token.',
@@ -45,18 +45,23 @@ module GithubCLI
     no_tasks do
       def defaults
         {
-          'auth.token'    => nil,
-          'auth.basic'    => nil,
-          'auth.login'    => nil,
-          'auth.password' => nil,
-          'core.endpoint' => nil,
+          'user.token'    => nil,
+          'user.login'    => nil,
+          'user.password' => nil,
+          'user.name'     => nil,
+          'user.repo'     => nil,
+          'user.org'      => nil,
+          'core.adapter'  => :net_http,
+          'core.endpoint' => 'https://api.github.com',
+          'core.ssl'      => nil,
+          'core.mime'     => :json,
           'core.editor'   => 'vi',
           'core.pager'    => 'less',
           'core.no-pager' => false,
           'core.no-color' => false,
-          'core.format'   => 'csv',
-          'core.auto'     => false,
-          'core.aliases'  => {}
+          'core.format'   => 'table',
+          'core.auto_pagination' => false,
+          'core.aliases'  => nil,
         }
       end
     end
@@ -72,18 +77,11 @@ module GithubCLI
     DESC
     method_option :force, :type => :boolean, :default => false, :aliases => "-f",
                   :banner => "Overwrite configuration file. "
-    method_option :global, :type => :boolean, :default => false,
-                  :desc => 'Create global config file'
     method_option :local, :type => :boolean, :default => false,
-                  :desc => 'Create local config file'
+                  :desc => 'Create local configuration file, otherwise a global configuration file in user home is created.'
     def init(filename=nil)
-      config_filename = (filename.nil? || filename =~ /^\//)? options[:config] : filename
-
-      if !options[:global] and !options[:local]
-        GithubCLI.ui.error 'Invalid scope given. Please use --local or --global.'
-        exit 1
-      end
-
+      config_filename = filename ? filename : options[:filename]
+      GithubCLI.config.filename = config_filename
       GithubCLI.config.location = options[:local] ? 'local' : 'global'
 
       if File.exists?(GithubCLI.config.path) && !options[:force]
@@ -91,8 +89,7 @@ module GithubCLI
         exit 1
       end
 
-      oauth_token = ask "Please specify your GitHub Authentication Token (register on github.com to get it):"
-      GithubCLI.config.save(defaults.merge({'auth.token' => oauth_token}))
+      GithubCLI.config.save(defaults)
       GithubCLI.ui.confirm "Writing new configuration file to #{GithubCLI.config.path}"
     end
 
@@ -106,8 +103,6 @@ module GithubCLI
       There two types of config files, global and project specific. When modifying
       options ensure that you modifying the correct config.
     DESC
-    method_option :global, :type => :boolean, :default => false,
-                  :desc => 'use global config file'
     method_option :local, :type => :boolean, :default => false,
                   :desc => 'use local config file'
     method_option :list, :type => :boolean, :default => false, :aliases => '-l',
@@ -116,14 +111,10 @@ module GithubCLI
                   :desc => 'opens an editor'
     def config(*args)
       name, value = args.shift, args.shift
-
       GithubCLI.config.location = options[:local] ? 'local' : 'global'
 
-      if !options[:global] and !options[:local]
-        GithubCLI.ui.error 'Invalid scope given. Please use --local or --global.'
-        exit 1
-      elsif !File.exists?(GithubCLI.config.path)
-        GithubCLI.ui.error "#{GithubCLI.config.location} configuration file does not exist. Please use `#{GithubCLI.executable_name} init --#{GithubCLI.config.location}`"
+      if !File.exists?(GithubCLI.config.path)
+        GithubCLI.ui.error "Configuration file does not exist. Please use `#{GithubCLI.executable_name} init` to create one."
         exit 1
       end
 

data/lib/github_cli/command.rb

@@ -58,7 +58,7 @@ module GithubCLI
         Thor::Base.subclasses.each do |klass|
           namespace = extract_namespace(klass)
           next unless is_api_command?(namespace)
-          namespace = "" if namespace.index API_CLASSES.first
+          namespace = "" if namespace.index(API_CLASSES.first)
 
           klass.tasks.each do |task|
             next if task.last.name.index HELP_COMMAND

data/lib/github_cli/commands/authorizations.rb

@@ -22,6 +22,12 @@ module GithubCLI
     end
 
     desc 'create', 'Create a new authorization'
+    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."
     long_desc <<-DESC
       You can only create your own token, and only through Basic Authentication.\n
 
@@ -32,10 +38,24 @@ module GithubCLI
       note_url - Optional string - A URL to remind you what the OAuth token is for.
     DESC
     def create
-      Authorization.create options[:params], options[:format]
+      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]
+      Authorization.create params, options[:format]
     end
 
     desc 'update <id>', 'Update an existing authorization'
+    option :scopes, :type => :array, :banner => "user public_repo repo...",
+      :desc => "A list of scopes that this authorization is in."
+    option :add_scopes, :type => :array,
+      :desc => "A list of scopes to add to this authorization."
+    option :remove_scopes, :type => :array,
+      :desc => "A list of scopes to remove from this authorization."
+    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."
     long_desc <<-DESC
       Inputs
 
@@ -46,7 +66,13 @@ module GithubCLI
       note_url - Optional string - A URL to remind you what the OAuth token is for.
     DESC
     def update(id)
-      Authorization.update id, options[:params], options[:format]
+      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]
+      Authorization.update id, params, options[:format]
     end
 
     desc 'delete <id>', 'Delete an authorization'

data/lib/github_cli/commands/collaborators.rb

@@ -5,24 +5,24 @@ module GithubCLI
 
     namespace :collab
 
-    desc 'list <user> <repo>', 'Lists collaborators'
-    def list(user, repo)
-      Collaborator.all user, repo, options[:params], options[:format]
+    desc 'list <owner> <repo>', 'Lists collaborators'
+    def list(owner, repo)
+      Collaborator.all owner, repo, options[:params], options[:format]
     end
 
-    desc 'add <user> <repo> <collab>', 'Add a collaborator'
-    def add(user, repo, collab)
-      Collaborator.add user, repo, collab, options[:params], options[:format]
+    desc 'add <owner> <repo> <user>', 'Add a collaborator'
+    def add(owner, repo, user)
+      Collaborator.add owner, repo, user, options[:params], options[:format]
     end
 
-    desc 'collab <user> <repo> <collab>', 'Checks if user is a collaborator on a given repo'
-    def collab(user, repo, collab)
-      Collaborator.collaborator? user, repo, collab, options[:params], options[:format]
+    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]
     end
 
-    desc 'remove <user> <repo> <id>', 'Remove a collaborator'
-    def remove(user, repo, collab)
-      Collaborator.remove user, repo, collab, options[:params], options[:format]
+    desc 'remove <owner> <repo> <user>', 'Remove a collaborator'
+    def remove(owner, repo, user)
+      Collaborator.remove owner, repo, user, options[:params], options[:format]
     end
 
   end # Collaborators

data/lib/github_cli/commands/commits.rb

@@ -11,6 +11,16 @@ module GithubCLI
     end
 
     desc 'create <user> <repo>', 'Create a Commit'
+    option :message, :type => :string, :aliases => ["-m"],
+      :desc => "String of the commit message."
+    option :tree, :type => :string, :aliases => ["-t"], :banner => "<sha>",
+      :desc => "String of the SHA of the tree object this commit points to."
+    option :parents, :type => :array, :banner => "<sha1> <sha2> ...",
+      :desc => "Array of the SHAs of the commits that were the parents of this commit. "
+    option :author, :type => :hash,
+      :desc => "If the author section is omitted, it will be filled in with the authenticated user’s information and the current date."
+    option :committer, :type => :hash,
+      :desc => "The committer section is optional and will be filled with the author data if omitted."
     long_desc <<-DESC
       Parameters
 
@@ -27,10 +37,16 @@ module GithubCLI
         author.date - Timestamp of when this commit was authored \n
         committer.name - String of the name of the committer of the commit \n
         committer.email - String of the email of the committer of the commit \n
-        committer.date:: Timestamp of when this commit was committed
+        committer.date - Timestamp of when this commit was committed
     DESC
     def create(user, repo)
-      Commit.create user, repo, options[:params], options[:format]
+      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['committer'] = options[:committer] if options[:committer]
+      Commit.create user, repo, params, options[:format]
     end
 
   end # Commit

data/lib/github_cli/commands/events.rb

@@ -39,10 +39,9 @@ module GithubCLI
       Otherwise, you’ll only see public events.
     DESC
     def received(user)
-      if options[:public]
-        options[:params]['public'] = true
-      end
-      Event.received user, options[:params], options[:format]
+      params = options[:params].dup
+      params['public'] = options[:public] if options[:public]
+      Event.received user, params, options[:format]
     end
 
     desc 'performed <user>', 'Lists all events that a user has performed'
@@ -53,10 +52,9 @@ module GithubCLI
       events. Otherwise, you’ll only see public events.
     DESC
     def performed(user)
-      if options[:public]
-        options[:params]['public'] = true
-      end
-      Event.performed user, options[:params], options[:format]
+      params = options[:params].dup
+      params['public'] = true if options[:public]
+      Event.performed user, params, options[:format]
     end
 
     desc 'user_org <user> <org>', "Lists all events for a user's organization"

data/lib/github_cli/commands/followers.rb

@@ -13,7 +13,7 @@ module GithubCLI
       Follower.all options[:user], options[:params], options[:format]
     end
 
-    desc 'following', 'List who the authenticated user is following'
+    desc 'following', 'List who a user/the authenticated user is following'
     method_option :user, :type => :string, :aliases => ["-u"],
                   :desc => 'List who a <user> is following',
                   :banner => '<user>'

data/lib/github_cli/commands/labels.rb

@@ -6,8 +6,20 @@ module GithubCLI
     namespace :label
 
     desc 'list <user> <repo>', 'Listing all labels for this repository.'
+    method_option :milestone, :type => :string, :aliases => ["-m"],
+                  :desc => 'List labels for every issue in a milestone.',
+                  :banner => '<milestone>'
+    method_option :issue, :type => :string, :aliases => ["-i"],
+                  :desc => 'List labels on an issue.',
+                  :banner => '<issue>'
     def list(user, repo)
-      Label.all user, repo, options[:params], options[:format]
+      params = options[:params].dup
+      if (milestone_id = options[:milestone])
+        params['milestone_id'] = milestone_id
+      elsif (issue_id = options[:issue])
+        params['issue_id'] = issue_id
+      end
+      Label.all user, repo, params, options[:format]
     end
 
     desc 'get <user> <repo> <name>', 'Get a single label.'
@@ -35,30 +47,20 @@ module GithubCLI
       Label.delete user, repo, name, options[:params], options[:format]
     end
 
-    desc 'issue <user> <repo> <number>', 'List labels on an issue.'
-    def issue(user, repo, number)
-      Label.issue user, repo, number, options[:params], options[:format]
+    desc 'add <user> <repo> <number> <label>[<label>...]', 'Add labels to issue <number>.'
+    def add(user, repo, number, *args)
+      Label.add user, repo, number, args, options[:params], options[:format]
     end
 
-    desc 'add <user> <repo> <issue_id> <label>[<label>...]', 'Add labels to <issue_id>.'
-    def add(user, repo, issue_id, *args)
-      Label.add user, repo, issue_id, args, options[:params], options[:format]
-    end
-
-    desc 'remove <user> <repo> [<label_id>/]<issue_id>', 'Remove <label_id> from an <issue_id>'
+    desc 'remove <user> <repo> [<name>/]<number>', 'Remove label<name> from an issue<number>'
     def remove(user, repo, number)
-      label_id, issue_id  = Arguments.new(number).parse
-      Label.remove user, repo, issue_id, label_id, options[:params], options[:format]
-    end
-
-    desc 'replace <user> <repo> <issue_id> <label>[<label>...]', 'Replace all labels for an <issue_id>.'
-    def replace(user, repo, issue_id, *args)
-      Label.replace user, repo, issue_id, args, options[:params], options[:format]
+      name, number  = Arguments.new(number).parse
+      Label.remove user, repo, number, name, options[:params], options[:format]
     end
 
-    desc 'milestone <user> <repo> <number>', 'Get labels for every issue in a milestone.'
-    def milestone(user, repo, number)
-      Label.milestone user, repo, number, options[:params], options[:format]
+    desc 'replace <user> <repo> <number> <label>[<label>...]', 'Replace all labels for an issue <number>.'
+    def replace(user, repo, number, *args)
+      Label.replace user, repo, number, args, options[:params], options[:format]
     end
 
   end # Labels