github_cli 0.1.0 → 0.1.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    github_cli (0.1.0)
+    github_cli (0.1.1)
       github_api (~> 0.4.8)
       thor
 

data/features/search.feature

@@ -24,3 +24,10 @@ Feature: Github API Commands Search
       | pattern |
       | re      |
       | repo    |
+
+  Scenario: No Match
+    When I run `ghc list bla`
+    Then the output should contain:
+    """
+    ghc: 'bla' is not a ghc command. See 'ghc --help'.
+    """

data/features/settings.feature

@@ -41,5 +41,4 @@ Feature: Global Settings
     Writing new configuration file to /tmp/fakehome/myname
     """
 
-
   Scenario: Check for presence of yaml attribute

data/lib/github_cli/{blob.rb → apis/blob.rb}

@@ -14,5 +14,5 @@ module GithubCLI
       end
     end
 
-  end # Repository
+  end # Blob
 end # GithubCLI

data/lib/github_cli/apis/tag.rb

@@ -0,0 +1,18 @@
+# encoding: utf-8
+
+module GithubCLI
+  class Tag < API
+
+    class << self
+
+      def get(user, repo, sha, params)
+        github_api.repos.get_tag user, repo, params
+      end
+
+      def create(user, repo, params)
+        github_api.repos.create_tag user, repo, params
+      end
+    end
+
+  end # Tag
+end # GithubCLI

data/lib/github_cli/apis.rb

@@ -0,0 +1,18 @@
+if defined?(require_relative)
+  def require_api(path)
+    require_relative "apis/#{path}"
+  end
+else
+  def require_api(path)
+    require "github_cli/apis/#{path}"
+  end
+end
+
+%w[
+  blob
+  repository
+  tag
+  tree
+].each do |api|
+  require_api api
+end

data/lib/github_cli/cli.rb

@@ -6,14 +6,10 @@ module GithubCLI
 
     def initialize(*args)
       super
-      say <<-TEXT
-
-Github CLI client
-
-      TEXT
       the_shell = (options["no-color"] ? Thor::Shell::Basic.new : shell)
       GithubCLI.ui = UI.new(the_shell)
       GithubCLi.ui.debug! if options["verbose"]
+      Terminal.print_program_name
     end
 
     map "repository" => :repo,
@@ -66,20 +62,23 @@ Github CLI client
       Terminal.print_commands pattern
     end
 
-    desc "blob <command>", "leverage Blobs API"
-    subcommand "blob", GithubCLI::Blobs
+    desc "blob <command>", "Leverage Blobs API"
+    subcommand "blob", GithubCLI::Commands::Blobs
+
+    desc "repo <command>", "Leverage Repositories API"
+    subcommand "repo", GithubCLI::Commands::Repositories
 
-    desc "repo <command>", "leverage Repositories API"
-    subcommand "repo", GithubCLI::Repositories
+    desc "issue <command>", "Leverage Issues API"
+    subcommand "issue", GithubCLI::Commands::Issues
 
-    desc "issue <command>", "leverage Issues API"
-    subcommand "issue", GithubCLI::Issues
+    desc "label <command>", "Leverage Labels API"
+    subcommand "label", GithubCLI::Commands::Labels
 
-    desc "label <command>", "leverage Labels API"
-    subcommand "label", GithubCLI::Labels
+    desc "tag <command>", "Leverage Tags API"
+    subcommand "tag", GithubCLI::Commands::Tags
 
-    desc "tree <command>", "leverage Trees API"
-    subcommand "tree", GithubCLI::Trees
+    desc "tree <command>", "Leverage Trees API"
+    subcommand "tree", GithubCLI::Commands::Trees
 
     desc 'version', 'Display Github CLI version.'
     def version

data/lib/github_cli/{blobs.rb → commands/blobs.rb}

@@ -1,9 +1,7 @@
 # encoding: utf-8
 
-require 'github_cli/command'
-
 module GithubCLI
-  class Blobs < Command
+  class Commands::Blobs < Command
 
     namespace :blob
 

data/lib/github_cli/{issues.rb → commands/issues.rb}

@@ -1,9 +1,7 @@
 # encoding: utf-8
 
-require 'github_cli/command'
-
 module GithubCLI
-  class Issues < Command
+  class Commands::Issues < Command
 
     namespace :issue
 

data/lib/github_cli/{labels.rb → commands/labels.rb}

@@ -1,9 +1,7 @@
 # encoding: utf-8
 
-require 'github_cli/command'
-
 module GithubCLI
-  class Labels < Command
+  class Commands::Labels < Command
 
     namespace :label
 
@@ -22,7 +20,7 @@ module GithubCLI
     end
 
     method_option :name, :type => :string, :required => true
-    desc 'update <user>, <repo>', 'Create a label.'
+    desc 'update <user>, <repo>', 'Update a label.'
     method_option :params, :type => :hash
     def update(user, repo)
     end

data/lib/github_cli/{repositories.rb → commands/repositories.rb}

@@ -1,9 +1,7 @@
 # encoding: utf-8
 
-require 'github_cli/command'
-
 module GithubCLI
-  class Repositories < Command
+  class Commands::Repositories < Command
 
     namespace :repo
 

data/lib/github_cli/commands/tags.rb

@@ -0,0 +1,25 @@
+# encoding: utf-8
+
+module GithubCLI
+  class Commands::Tags < Command
+
+    namespace :tag
+
+    desc 'get <user> <repo> <sha>', 'Get a Tag'
+    method_option :recursive, :type => :boolean, :aliases => ["-r"],
+                  :desc => 'get a tree recursively'
+    method_option :params, :type => :hash, :default => {},
+                  :desc => 'Additonal request parameters e.i per_page:100'
+    def get(user, repo, sha)
+      Tag.get user, repo, sha, options[:params]
+    end
+
+    desc 'create <user> <repo>', 'Create a Tag Object'
+    method_option :params, :type => :hash, :default => {},
+                  :desc => 'Additonal request parameters e.i per_page:100'
+    def create(user, repo)
+      Tag.create user, repo, options[:params]
+    end
+
+  end # Tag
+end # GithubCLI

data/lib/github_cli/{trees.rb → commands/trees.rb}

@@ -1,9 +1,7 @@
 # encoding: utf-8
 
-require 'github_cli/command'
-
 module GithubCLI
-  class Trees < Command
+  class Commands::Trees < Command
 
     namespace :tree
 

data/lib/github_cli/commands.rb

@@ -0,0 +1,12 @@
+# encoding: utf-8
+
+module GithubCLI
+  module Commands
+    autoload :Blobs,        'github_cli/commands/blobs'
+    autoload :Issues,       'github_cli/commands/issues'
+    autoload :Labels,       'github_cli/commands/labels'
+    autoload :Repositories, 'github_cli/commands/repositories'
+    autoload :Tags,         'github_cli/commands/tags'
+    autoload :Trees,        'github_cli/commands/trees'
+  end # Commands
+end # GithubCLI

data/lib/github_cli/config.rb

@@ -3,9 +3,10 @@
 module GithubCLI
   class Config
     COMMAND_KEY = 'commands'
+    COMMAND_HELP = 'help'
 
     def initialize(config_filename=nil)
-      @filename = config_filename || '.githubrc'
+      @filename = config_filename || local_options_file
     end
 
     def []=(key, value)
@@ -32,7 +33,7 @@ module GithubCLI
     def save(config)
       config[COMMAND_KEY] = {}
       Command.all.each do |cmd|
-        if !cmd.namespace.empty? && cmd.name != 'help'
+        if !cmd.namespace.empty? && cmd.name != COMMAND_HELP
           config[COMMAND_KEY]["#{cmd.namespace}-#{cmd.name}"] = { }
         end
       end
@@ -60,6 +61,22 @@ module GithubCLI
       end
     end
 
+    def custom_options_file
+    end
+
+    def local_options_file
+      '.githubrc'
+    end
+
+    def global_options_file
+      begin
+        File.join Thor::Util.user_home, ".githubrc"
+      rescue ArgumentError
+        GithubCLI.ui.warn "Unable to find ~/.githubrc because the HOME environment variable is not set"
+        nil
+      end
+    end
+
     def set_key(key, value)
       unless data[key] == value
         data[key] = value

data/lib/github_cli/dsl.rb

@@ -0,0 +1,21 @@
+# encoding: utf-8
+
+module GithubCLI
+  module DSL
+    @@program_name = $0.split(/\//)[-1]
+    @@error_block  = nil
+
+    # Defines a program name.
+    def program_name(name=nil)
+      if name
+        @@program_name = name
+      end
+      @@program_name
+    end
+
+    # Defines behaviour on error.
+    def on_error(&block)
+      @@error_block = block
+    end
+  end
+end

data/lib/github_cli/terminal.rb

@@ -10,14 +10,40 @@ module GithubCLI
       attr_accessor :size
 
       def print_commands(pattern=nil)
-        GithubCLI.ui.info 'Commands:'
-        Command.all.each do |cmd|
-          print_command cmd if pattern && cmd.namespace =~ pattern
+        GithubCLI.ui.info "Commands:"
+
+        commands = Command.all.select do |cmd|
+          cmd if pattern && cmd.namespace =~ pattern
+        end.map do |cmd|
+          build_command cmd
+        end
+
+        if !commands.empty?
+          GithubCLI.ui.print_table commands, :truncate => true
+        else
+          print_command_not_found pattern.to_s.gsub(/\W|/, '')[3..-1]
+        end
+      end
+
+      def build_command(cmd, indent=3)
+        prefix = " " * indent
+        if cmd.namespace.empty?
+          ["#{prefix + cmd.usage}", cmd.desc]
+        else
+          ["#{prefix + cmd.namespace} #{cmd.usage}", cmd.desc]
         end
       end
 
-      def print_command(cmd, usage_text='usage')
-        GithubCLI.ui.info "    ghc #{cmd.namespace} #{cmd.usage}"
+      def print_command_not_found(cmd)
+        GithubCLI.ui.info "ghc: '#{cmd}' is not a ghc command. See 'ghc --help'."
+      end
+
+      def print_program_name
+        GithubCLI.ui.info <<-TEXT
+
+  #{GithubCLI.program_name}
+
+        TEXT
       end
     end
 

data/lib/github_cli/ui.rb

@@ -31,5 +31,9 @@ module GithubCLI
     def debug!
       @debug = true
     end
+
+    def print_table(table, options={})
+      @shell.print_table table, options
+    end
   end # UI
 end # GithubCLI

data/lib/github_cli/version.rb

@@ -1,3 +1,3 @@
 module GithubCLI
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/github_cli.rb

@@ -7,21 +7,20 @@ require 'github_api'
 require 'github_cli/version'
 
 module GithubCLI
-  autoload :Config,       'github_cli/config'
-  autoload :CLI,          'github_cli/cli'
-  autoload :Terminal,     'github_cli/terminal'
-  autoload :Blob,         'github_cli/blob'
-  autoload :Blobs,        'github_cli/blobs'
-  autoload :Tree,         'github_cli/tree'
-  autoload :Trees,        'github_cli/trees'
-  autoload :Repositories, 'github_cli/repositories'
-  autoload :UI,           'github_cli/ui'
-
-  require "github_cli/api"
-  require "github_cli/repository"
-  require "github_cli/issues"
-  require "github_cli/labels"
-  require "github_cli/command"
+  autoload :DSL,       'github_cli/dsl'
+  autoload :Config,    'github_cli/config'
+  autoload :CLI,       'github_cli/cli'
+  autoload :Command,   'github_cli/command'
+  autoload :API,       'github_cli/api'
+  autoload :Terminal,  'github_cli/terminal'
+  autoload :Commands,  'github_cli/commands'
+  autoload :UI,        'github_cli/ui'
+
+  require 'github_cli/apis'
+
+  extend DSL
+
+  program_name 'Github CLI client'
 
   class << self
     attr_writer :ui, :config

data/spec/github_cli/command_spec.rb

@@ -4,7 +4,7 @@ describe GithubCLI::Command do
 
   context '#all' do
     let(:task) { stub(:task, :name => 'create').as_null_object }
-    let(:klass) { GithubCLI::Repositories }
+    let(:klass) { GithubCLI::Commands::Repositories }
 
     before do
       task.stub(:last) { task }

data/spec/github_cli/config_spec.rb

@@ -2,10 +2,11 @@ require 'spec_helper'
 
 describe GithubCLI::Config do
   let(:filename) { '.githubrc' }
+  let(:config_name) { 'simple_config' }
   let(:path) { "/users/#{filename}" }
 
   context 'global' do
-    let(:config) { GithubCLI::Config.new filename }
+    let(:config) { GithubCLI::Config.new fixture_path(config_name) }
 
     before do
       File.stub(:open) { YAML.load fixture('simple_config') }
@@ -89,6 +90,7 @@ describe GithubCLI::Config do
     end
 
     it 'expands relative path' do
+      config = GithubCLI::Config.new
       config.path.should == "#{ENV['HOME']}/#{filename}"
     end
   end

data/spec/spec_helper.rb

@@ -11,5 +11,9 @@ RSpec.configure do |config|
 end
 
 def fixture(name)
-  File.read(File.join(File.dirname(__FILE__), '..', 'fixtures', name))
+  File.read File.expand_path File.join(File.dirname(__FILE__), '..', 'fixtures', name)
+end
+
+def fixture_path(name)
+  File.expand_path File.join(File.dirname(__FILE__), '..', 'fixtures', name)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: github_cli
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-01 00:00:00.000000000 Z
+date: 2012-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: github_api
-  requirement: &2151931900 !ruby/object:Gem::Requirement
+  requirement: &2151931920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.4.8
   type: :runtime
   prerelease: false
-  version_requirements: *2151931900
+  version_requirements: *2151931920
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2151931320 !ruby/object:Gem::Requirement
+  requirement: &2151931300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2151931320
+  version_requirements: *2151931300
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2151930440 !ruby/object:Gem::Requirement
+  requirement: &2151930280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151930440
+  version_requirements: *2151930280
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &2151929620 !ruby/object:Gem::Requirement
+  requirement: &2151929540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151929620
+  version_requirements: *2151929540
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2151928960 !ruby/object:Gem::Requirement
+  requirement: &2151928740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151928960
+  version_requirements: *2151928740
 description: CLI-based access to GitHub API v3
 email:
 - pmurach@gmail.com
@@ -93,18 +93,23 @@ files:
 - github_cli.gemspec
 - lib/github_cli.rb
 - lib/github_cli/api.rb
-- lib/github_cli/blob.rb
-- lib/github_cli/blobs.rb
+- lib/github_cli/apis.rb
+- lib/github_cli/apis/blob.rb
+- lib/github_cli/apis/repository.rb
+- lib/github_cli/apis/tag.rb
+- lib/github_cli/apis/tree.rb
 - lib/github_cli/cli.rb
 - lib/github_cli/command.rb
+- lib/github_cli/commands.rb
+- lib/github_cli/commands/blobs.rb
+- lib/github_cli/commands/issues.rb
+- lib/github_cli/commands/labels.rb
+- lib/github_cli/commands/repositories.rb
+- lib/github_cli/commands/tags.rb
+- lib/github_cli/commands/trees.rb
 - lib/github_cli/config.rb
-- lib/github_cli/issues.rb
-- lib/github_cli/labels.rb
-- lib/github_cli/repositories.rb
-- lib/github_cli/repository.rb
+- lib/github_cli/dsl.rb
 - lib/github_cli/terminal.rb
-- lib/github_cli/tree.rb
-- lib/github_cli/trees.rb
 - lib/github_cli/ui.rb
 - lib/github_cli/version.rb
 - spec/github_cli/api_spec.rb