github_cli 0.5.9 → 0.6.0

data/lib/github_cli/commands/teams.rb

@@ -7,12 +7,18 @@ module GithubCLI
 
     desc 'list <org>', "List teams"
     def list(org)
-      Team.all org, options[:params], options[:format]
+      global_options = options.dup
+      params = options[:params].dup
+      Util.hash_without!(global_options, params.keys + ['params'])
+      Team.all org, params, global_options
     end
 
     desc 'get <id>', "Get a team"
     def get(id)
-      Team.get id, options[:params], options[:format]
+      global_options = options.dup
+      params = options[:params].dup
+      Util.hash_without!(global_options, params.keys + ['params'])
+      Team.get id, params, global_options
     end
 
     option :name, :type => :string, :required => true
@@ -32,12 +38,13 @@ module GithubCLI
       * admin - team members can pull, push and administor these repositories.\n
     DESC
     def create(org)
+      global_options = options.dup
       params = options[:params].dup
-      params['name'] = options[:name]
+      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]
+      Util.hash_without!(global_options, params.keys + ['params'])
+      Team.create org, params, global_options
     end
 
     option :name, :type => :string, :required => true
@@ -55,11 +62,12 @@ module GithubCLI
       * admin - team members can pull, push and administor these repositories.\n
     DESC
     def edit(id)
+      global_options = options.dup
       params = options[:params].dup
-      params['name'] = options[:name]
+      params['name']       = options[:name]
       params['permission'] = options[:permission] if options[:permission]
-
-      Team.edit id, params, options[:format]
+      Util.hash_without!(global_options, params.keys + ['params'])
+      Team.edit id, params, global_options
     end
 
     desc 'delete <id>', 'Delete team <id>'
@@ -67,12 +75,18 @@ module GithubCLI
       In order to delete a team, the authenticated user must be an owner of the org that the team is associated with.
     DESC
     def delete(id)
-      Team.delete id, options[:params], options[:format]
+      global_options = options.dup
+      params = options[:params].dup
+      Util.hash_without!(global_options, params.keys + ['params'])
+      Team.delete id, params, global_options
     end
 
     desc 'list_member <id>', "List team <id> members"
     def list_member(id)
-      Team.all_member id, options[:params], options[:format]
+      global_options = options.dup
+      params = options[:params].dup
+      Util.hash_without!(global_options, params.keys + ['params'])
+      Team.all_member id, params, global_options
     end
 
     desc 'member <id> <user>', 'Check if <user> is a team member'
@@ -80,7 +94,10 @@ module GithubCLI
       In order to get if a user is a member of a team, the authenticated user must be a member of the team.
     DESC
     def member(id, user)
-      Team.member id, user, options[:params], options[:format]
+      global_options = options.dup
+      params = options[:params].dup
+      Util.hash_without!(global_options, params.keys + ['params'])
+      Team.member id, user, params, global_options
     end
 
     desc 'add_member <id> <user>', 'Add team member'
@@ -88,7 +105,10 @@ module GithubCLI
       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
     def add_member(id, user)
-      Team.add_member id, user, options[:params], options[:format]
+      global_options = options.dup
+      params = options[:params].dup
+      Util.hash_without!(global_options, params.keys + ['params'])
+      Team.add_member id, user, params, global_options
     end
 
     desc 'remove_member <id> <user>', 'Remove team member'
@@ -99,17 +119,26 @@ module GithubCLI
       them from the team.
     DESC
     def remove_member(id, user)
-      Team.remove_member id, user, options[:params], options[:format]
+      global_options = options.dup
+      params = options[:params].dup
+      Util.hash_without!(global_options, params.keys + ['params'])
+      Team.remove_member id, user, params, global_options
     end
 
     desc 'list_repo <id>', "List team <id> repositories"
     def list_repo(id)
-      Team.all_repo id, options[:params], options[:format]
+      global_options = options.dup
+      params = options[:params].dup
+      Util.hash_without!(global_options, params.keys + ['params'])
+      Team.all_repo id, params, global_options
     end
 
     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]
+      global_options = options.dup
+      params = options[:params].dup
+      Util.hash_without!(global_options, params.keys + ['params'])
+      Team.repo id, user, repo, params, global_options
     end
 
     desc 'add_repo <id> <user> <repo>', 'Add team <repo>'
@@ -119,7 +148,10 @@ module GithubCLI
       by the organization, or a direct for of a repo owned by the organization.
     DESC
     def add_repo(id, user, repo)
-      Team.add_repo id, user, repo, options[:params], options[:format]
+      global_options = options.dup
+      params = options[:params].dup
+      Util.hash_without!(global_options, params.keys + ['params'])
+      Team.add_repo id, user, repo, params, global_options
     end
 
     desc 'remove_repo <id> <user> <repo>', 'Remove team <repo>'
@@ -129,7 +161,10 @@ module GithubCLI
       delete the repo, it just removes it from the team.
     DESC
     def remove_repo(id, user, repo)
-      Team.remove_repo id, user, repo, options[:params], options[:format]
+      global_options = options.dup
+      params = options[:params].dup
+      Util.hash_without!(global_options, params.keys + ['params'])
+      Team.remove_repo id, user, repo, params, global_options
     end
 
   end # Teams

data/lib/github_cli/commands/trees.rb

@@ -9,9 +9,11 @@ module GithubCLI
     method_option :recursive, :type => :boolean, :aliases => ["-r"],
                   :desc => 'get a tree recursively'
     def get(user, repo, sha)
+      global_options = options.dup
       params = options[:params].dup
       params['recursive'] = options[:recursive] if options[:recursive]
-      Tree.get user, repo, sha, params, options[:format]
+      Util.hash_without!(global_options, params.keys + ['params'])
+      Tree.get user, repo, sha, params, global_options
     end
 
     desc 'create <user> <repo>', 'Create a new Tree'
@@ -36,10 +38,12 @@ module GithubCLI
       tree.content - String of content you want this file to have - GitHub will write this blob out and use the SHA for this entry. Use either this or tree.sha
     DESC
     def create(user, repo)
+      global_options = options.dup
       params = options[:params].dup
       params['base_tree'] = options[:base_tree] if options[:base_tree]
       params['tree']      = options[:tree] if options[:tree]
-      Tree.create user, repo, params, options[:format]
+      Util.hash_without!(global_options, params.keys + ['params'])
+      Tree.create user, repo, params, global_options
     end
 
   end # Blobs

data/lib/github_cli/commands/users.rb

@@ -9,9 +9,11 @@ module GithubCLI
     option :since, :type => :string, :banner => "<user>",
            :desc => "The integer ID of the last User that you’ve seen."
     def list
+      global_options = options.dup
       params = options[:params].dup
       params['since'] = options[:since] if options[:since]
-      User.all params, options[:format]
+      Util.hash_without!(global_options, params.keys + ['params'])
+      User.all params, global_options
     end
 
     desc 'get', 'Get the authenticated user'
@@ -19,9 +21,11 @@ module GithubCLI
            :desc => 'Get a single unauthenticated <user>',
            :banner => '<user>'
     def get
+      global_options = options.dup
       params = options[:params].dup
       params['user'] = options[:user] if options[:user]
-      User.get params, options[:format]
+      Util.hash_without!(global_options, params.keys + ['params'])
+      User.get params, global_options
     end
 
     desc 'update', 'Update the authenticated user'
@@ -33,6 +37,7 @@ module GithubCLI
     option :hireable, :type => :string
     option :bio, :type => :string
     def update
+      global_options = options.dup
       params = options[:params].dup
       params['name']     = options[:name]     if options[:name]
       params['email']    = options[:email]    if options[:email]
@@ -41,7 +46,8 @@ module GithubCLI
       params['location'] = options[:location] if options[:location]
       params['hireable'] = options[:hireable] if options[:hireable]
       params['bio']      = options[:bio]      if options[:bio]
-      User.update params, options[:format]
+      Util.hash_without!(global_options, params.keys + ['params'])
+      User.update params, global_options
     end
 
   end # Users

data/lib/github_cli/commands/watching.rb

@@ -7,33 +7,47 @@ module GithubCLI
 
     desc 'list <user> <repo>', 'Lists repo watchers'
     def list(user, repo)
-      Watching.list user, repo, options[:params], options[:format]
+      global_options = options.dup
+      params = options[:params].dup
+      Util.hash_without!(global_options, params.keys + ['params'])
+      Watching.list user, repo, params, global_options
     end
 
     desc 'watched', 'Lists repos being watched by a user'
     method_option :user, :type => :string, :aliases => ["-u"],
                   :desc => 'Watch repositories for <user>'
     def watched
+      global_options = options.dup
       params = options[:params].dup
       if options[:user]
         params['user'] = options[:user]
       end
-      Watching.watched params, options[:format]
+      Util.hash_without!(global_options, params.keys + ['params'])
+      Watching.watched params, global_options
     end
 
     desc 'watching <user> <repo>', 'Check if you are watching a repository'
     def watching(user, repo)
-      Watching.watching? user, repo, options[:params], options[:format]
+      global_options = options.dup
+      params = options[:params].dup
+      Util.hash_without!(global_options, params.keys + ['params'])
+      Watching.watching? user, repo, params, global_options
     end
 
     desc 'start <user> <repo>', 'Watch a repository'
     def start(user, repo)
-      Watching.start user, repo, options[:params], options[:format]
+      global_options = options.dup
+      params = options[:params].dup
+      Util.hash_without!(global_options, params.keys + ['params'])
+      Watching.start user, repo, params, global_options
     end
 
     desc 'stop <user> <repo>', 'Stop watching a repository'
     def stop(user, repo)
-      Watching.stop user, repo, options[:params], options[:format]
+      global_options = options.dup
+      params = options[:params].dup
+      Util.hash_without!(global_options, params.keys + ['params'])
+      Watching.stop user, repo, params, global_options
     end
 
   end # Watching

data/lib/github_cli/vendor/thor/actions/directory.rb

@@ -39,6 +39,7 @@ class Thor
     # config<Hash>:: give :verbose => false to not log the status.
     #                If :recursive => false, does not look for paths recursively.
     #                If :mode => :preserve, preserve the file mode from the source.
+    #                If :exclude_pattern => /regexp/, prevents copying files that match that regexp.
     #
     # ==== Examples
     #
@@ -78,6 +79,7 @@ class Thor
 
           files(lookup).sort.each do |file_source|
             next if File.directory?(file_source)
+            next if config[:exclude_pattern] && file_source.match(config[:exclude_pattern])
             file_destination = File.join(given_destination, file_source.gsub(source, '.'))
             file_destination.gsub!('/./', '/')
 

data/lib/github_cli/vendor/thor/actions/empty_directory.rb

@@ -97,28 +97,12 @@ class Thor
         #
         #   user.rb
         #
-        # The method referenced by %-string SHOULD be public. Otherwise you
-        # get the exception with the corresponding error message.
+        # The method referenced can be either public or private.
         #
         def convert_encoded_instructions(filename)
           filename.gsub(/%(.*?)%/) do |initial_string|
-            call_public_method($1.strip) or initial_string
-          end
-        end
-
-        # Calls `base`'s public method `sym`.
-        # Returns:: result of `base.sym` or `nil` if `sym` wasn't found in
-        #  `base`
-        # Raises::  Thor::PrivateMethodEncodedError if `sym` references
-        #  a private method.
-        def call_public_method(sym)
-          if base.respond_to?(sym)
-            base.send(sym)
-          elsif base.respond_to?(sym, true)
-            raise Thor::PrivateMethodEncodedError,
-              "Method #{base.class}##{sym} should be public, not private"
-          else
-            nil
+            method = $1.strip
+            base.respond_to?(method, true) ? base.send(method) : initial_string
           end
         end
 

data/lib/github_cli/vendor/thor/actions/file_manipulation.rb

@@ -293,8 +293,11 @@ class Thor
     end
     alias :remove_dir :remove_file
 
+  attr_accessor :output_buffer
+  private :output_buffer, :output_buffer=
+
   private
-    attr_accessor :output_buffer
+
     def concat(string)
       @output_buffer.concat(string)
     end

data/lib/github_cli/vendor/thor/actions.rb

@@ -227,7 +227,7 @@ class Thor
     # ==== Parameters
     # command<String>:: the command to be executed.
     # config<Hash>:: give :verbose => false to not log the status, :capture => true to hide to output. Specify :with
-    #                to append an executable to command executation.
+    #                to append an executable to command execution.
     #
     # ==== Example
     #

data/lib/github_cli/vendor/thor/base.rb

@@ -119,6 +119,18 @@ class Thor
     end
 
     module ClassMethods
+      def attr_reader(*) #:nodoc:
+        no_commands { super }
+      end
+
+      def attr_writer(*) #:nodoc:
+        no_commands { super }
+      end
+
+      def attr_accessor(*) #:nodoc:
+        no_commands { super }
+      end
+
       # If you want to raise an error for unknown options, call check_unknown_options!
       # This is disabled by default to allow dynamic invocations.
       def check_unknown_options!
@@ -406,11 +418,10 @@ class Thor
       #   thor :my_command
       #
       def namespace(name=nil)
-        @namespace = case name
-        when nil
-          @namespace || Thor::Util.namespace_from_thor_class(self)
-        else
+        if name
           @namespace = name.to_s
+        else
+          @namespace ||= Thor::Util.namespace_from_thor_class(self)
         end
       end
 
@@ -462,17 +473,11 @@ class Thor
       end
       alias handle_no_task_error handle_no_command_error
 
-      def handle_argument_error(command, error, arity=nil) #:nodoc:
-        msg = "#{basename} #{command.name}"
-        if arity && arity != 0
-          required = arity < 0 ? (-1 - arity) : arity
-          msg << " requires at least #{required} argument"
-          msg << "s" if required > 1
-        else
-          msg = "call #{msg} as"
-        end
-
-        msg << ": #{self.banner(command).inspect}."
+      def handle_argument_error(command, error, args, arity) #:nodoc:
+        msg = "ERROR: #{basename} #{command.name} was called with "
+        msg << 'no arguments'               if  args.empty?
+        msg << 'arguments ' << args.inspect if !args.empty?
+        msg << "\nUsage: #{self.banner(command).inspect}."
         raise InvocationError, msg
       end
 
@@ -584,9 +589,6 @@ class Thor
           # Return if it's not a public instance method
           return unless public_method_defined?(meth.to_sym)
 
-          # Return if attr_* added the method
-          return if caller.first.to_s[/`attr_(reader|writer|accessor)'/]
-
           return if @no_commands || !create_command(meth)
 
           is_thor_reserved_word?(meth, :command)

data/lib/github_cli/vendor/thor/command.rb

@@ -32,7 +32,7 @@ class Thor
       end
     rescue ArgumentError => e
       handle_argument_error?(instance, e, caller) ?
-        instance.class.handle_argument_error(self, e, arity) : (raise e)
+        instance.class.handle_argument_error(self, e, args, arity) : (raise e)
     rescue NoMethodError => e
       handle_no_method_error?(instance, e, caller) ?
         instance.class.handle_no_command_error(name) : (raise e)

data/lib/github_cli/vendor/thor/error.rb

@@ -25,8 +25,4 @@ class Thor
 
   class MalformattedArgumentError < InvocationError
   end
-
-  # Raised when a user tries to call a private method encoded in templated filename.
-  class PrivateMethodEncodedError < Error
-  end
 end

data/lib/github_cli/vendor/thor/group.rb

@@ -205,15 +205,10 @@ class Thor::Group
     end
     alias printable_tasks printable_commands
 
-    def handle_argument_error(command, error, arity=nil) #:nodoc:
-      if arity > 0
-        msg = "#{basename} #{command.name} takes #{arity} argument"
-        msg << "s" if arity > 1
-        msg << ", but it should not."
-      else
-        msg = "You should not pass arguments to #{basename} #{command.name}."
-      end
-
+    def handle_argument_error(command, error, args, arity) #:nodoc:
+      msg = "#{basename} #{command.name} takes #{arity} argument"
+      msg << "s" if arity > 1
+      msg << ", but it should not."
       raise error, msg
     end
 

data/lib/github_cli/vendor/thor/runner.rb

@@ -206,7 +206,7 @@ class Thor::Runner < Thor #:nodoc:
     # in the thor_root instead of loading them all.
     #
     # By default, it also traverses the current path until find Thor files, as
-    # described in thorfiles. This look up can be skipped by suppliying
+    # described in thorfiles. This look up can be skipped by supplying
     # skip_lookup true.
     #
     def initialize_thorfiles(relevant_to=nil, skip_lookup=false)

data/lib/github_cli/vendor/thor/shell/basic.rb

@@ -47,8 +47,13 @@ class Thor
       #
       def ask(statement, *args)
         options = args.last.is_a?(Hash) ? args.pop : {}
+        color = args.first
 
-        options[:limited_to] ? ask_filtered(statement, options[:limited_to], *args) : ask_simply(statement, *args)
+        if options[:limited_to]
+          ask_filtered(statement, color, options)
+        else
+          ask_simply(statement, color, options)
+        end
       end
 
       # Say (print) something to the user. If the sentence ends with a whitespace
@@ -372,17 +377,30 @@ HELP
         end
       end
 
-      def ask_simply(statement, color=nil)
-        say("#{statement} ", color)
-        stdin.gets.tap{|text| text.strip! if text}
+      def ask_simply(statement, color, options)
+        default = options[:default]
+        message = [statement, ("(#{default})" if default), nil].uniq.join(" ")
+        say(message, color)
+        result = stdin.gets
+
+        return unless result
+
+        result.strip!
+
+        if default && result == ""
+          default
+        else
+          result
+        end
       end
 
-      def ask_filtered(statement, answer_set, *args)
+      def ask_filtered(statement, color, options)
+        answer_set = options[:limited_to]
         correct_answer = nil
         until correct_answer
-          answer = ask_simply("#{statement} #{answer_set.inspect}", *args)
+          answers = answer_set.join(", ")
+          answer = ask_simply("#{statement} [#{answers}]", color, options)
           correct_answer = answer_set.include?(answer) ? answer : nil
-          answers = answer_set.map(&:inspect).join(", ")
           say("Your response must be one of: [#{answers}]. Please try again.") unless correct_answer
         end
         correct_answer

data/lib/github_cli/vendor/thor/version.rb

@@ -1,3 +1,3 @@
 class Thor
-  VERSION = "0.17.0"
+  VERSION = "0.18.1"
 end

data/lib/github_cli/vendor/thor.rb

@@ -3,6 +3,16 @@ require 'thor/base'
 
 class Thor
   class << self
+    # Allows for custom "Command" package naming.
+    #
+    # === Parameters
+    # name<String>
+    # options<Hash>
+    #
+    def package_name(name, options={})
+      @package_name = name.nil? || name == '' ? nil : name
+    end
+
     # Sets the default command when thor is executed without an explicit command to be called.
     #
     # ==== Parameters
@@ -185,7 +195,12 @@ class Thor
       end
       list.sort!{ |a,b| a[0] <=> b[0] }
 
-      shell.say "Commands:"
+      if @package_name
+        shell.say "#{@package_name} commands:"
+      else
+        shell.say "Commands:"
+      end
+
       shell.print_table(list, :indent => 2, :truncate => true)
       shell.say
       class_options_help(shell)
@@ -299,7 +314,7 @@ class Thor
     end
 
     def stop_on_unknown_option?(command) #:nodoc:
-      !!@stop_on_unknown_option && @stop_on_unknown_option.include?(command.name.to_sym)
+      command && !@stop_on_unknown_option.nil? && @stop_on_unknown_option.include?(command.name.to_sym)
     end
 
   protected

data/lib/github_cli/version.rb

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

data/spec/github_cli/api/configure_spec.rb

@@ -0,0 +1,50 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe GithubCLI::API, '#configure' do
+  let(:object) { described_class }
+
+  before {
+    GithubCLI.stub(:config).and_return(config)
+  }
+
+  subject { object.configure }
+
+  context 'with default' do
+    let(:config) { { } }
+
+    its(:adapter) { should eql(:net_http) }
+
+    its(:ssl) { should eql({}) }
+
+    its(:site) { should eql('https://github.com') }
+
+    its(:endpoint) { should eql('https://api.github.com') }
+
+    its(:oauth_token) { should be_nil }
+  end
+
+  context 'with config values' do
+    let(:config) {
+      {
+       'core.ssl' => {"verify" => false},
+       'core.adapter' => :patron,
+       'core.site' => 'http://site.com',
+       'core.endpoint' => 'http://api.com',
+       'user.token' => 'abc1234'
+      }
+    }
+
+    its(:adapter) { should eql(:patron) }
+
+    its(:ssl) { should eql({"verify" => false})}
+
+    its(:site) { should eql('http://site.com')}
+
+    its(:endpoint) { should eql('http://api.com') }
+
+    its(:oauth_token) { should eql('abc1234') }
+  end
+
+end

data/spec/github_cli/api/github_api_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe GithubCLI::API, '#gihtub_api' do
+  before {
+    described_class.send(:instance_variable_set, :@github_api, nil)
+  }
+
+  it 'sets up github api connection' do
+    github_instance = stub.as_null_object
+    Github.should_receive(:new).and_return github_instance
+    expect(described_class.github_api).to eql(github_instance)
+  end
+
+  it 'does not instantiate on subsequent calls' do
+    described_class.github_api
+    Github.should_receive(:new).exactly(0).times
+    described_class.github_api
+  end
+end # GithubCLI::API

data/spec/github_cli/commands/assignees_spec.rb

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

data/spec/github_cli/commands/blobs_spec.rb

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