defunkt-github 0.3.3 → 0.3.4

data/bin/gh

@@ -1,5 +1,8 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../lib/github'
+lib_dir = File.join(File.dirname(__FILE__), '..', 'lib')
+$LOAD_PATH.unshift lib_dir if File.directory?(lib_dir)
+
+require 'github'
 
 GitHub.activate ARGV

data/bin/github

@@ -1,5 +1,8 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../lib/github'
+lib_dir = File.join(File.dirname(__FILE__), '..', 'lib')
+$LOAD_PATH.unshift lib_dir if File.directory?(lib_dir)
+
+require 'github'
 
 GitHub.activate ARGV

data/github-gem.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "github"
-  s.version = "0.3.3"
+  s.version = "0.3.4"
 
   s.specification_version = 2 if s.respond_to? :specification_version=
 
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.email = %q{chris@ozmm.org}
   s.executables = ["github", "gh"]
   s.extra_rdoc_files = ["bin/github", "bin/gh", "lib/github/extensions.rb", "lib/github/command.rb", "lib/github/helper.rb", "lib/github.rb", "LICENSE", "README"]
-  s.files = ["bin/github", "commands/network.rb", "commands/commands.rb", "commands/helpers.rb", "lib/github/extensions.rb", "lib/github/command.rb", "lib/github/helper.rb", "lib/github.rb", "LICENSE", "Manifest", "README", "spec/command_spec.rb", "spec/extensions_spec.rb", "spec/github_spec.rb", "spec/helper_spec.rb", "spec/spec_helper.rb", "spec/ui_spec.rb", "spec/windoze_spec.rb", "github-gem.gemspec"]
+  s.files = ["bin/github", "lib/commands/network.rb", "lib/commands/commands.rb", "lib/commands/helpers.rb", "lib/github/extensions.rb", "lib/github/command.rb", "lib/github/helper.rb", "lib/github.rb", "LICENSE", "Manifest", "README", "spec/command_spec.rb", "spec/extensions_spec.rb", "spec/github_spec.rb", "spec/helper_spec.rb", "spec/spec_helper.rb", "spec/ui_spec.rb", "spec/windoze_spec.rb", "github-gem.gemspec"]
   s.has_rdoc = true
   s.homepage = %q{http://github.com/}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Github", "--main", "README"]
@@ -22,5 +22,5 @@ Gem::Specification.new do |s|
   s.summary = %q{The official `github` command line helper for simplifying your GitHub experience.}
 
   # s.add_dependency(%q<launchy>, [">= 0"])
-  s.add_dependency('json', [">= 0"])
+  s.add_dependency('json_pure', [">= 0"])
 end

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

@@ -37,7 +37,7 @@ command :info do
   puts "== Info for #{helper.project}"
   puts "You are #{helper.owner}"
   puts "Currently tracking:"
-  helper.tracking.sort { |(a,),(b,)| a == :origin ? -1 : b == :origin ? 1 : a.to_s <=> b.to_s }.each do |(name,user_or_url)|
+  helper.tracking.sort { |(a,),(b,)| a == helper.origin ? -1 : b == helper.origin ? 1 : a.to_s <=> b.to_s }.each do |(name,user_or_url)|
     puts " - #{user_or_url} (as #{name})"
   end
 end
@@ -108,9 +108,9 @@ command :pull do |user, branch|
   if options[:merge]
     git_exec "pull #{user} #{branch}"
   else
-    puts "Switching to #{user}/#{branch}"
-    git "update-ref refs/heads/#{user}/#{branch} HEAD"
-    git "checkout #{user}/#{branch}"
+    puts "Switching to #{user}-#{branch}"
+    git "fetch #{user}"
+    git_exec "checkout -b #{user}/#{branch} #{user}/#{branch}"
   end
 end
 
@@ -135,13 +135,57 @@ end
 
 desc "Generate the text for a pull request."
 usage "github pull-request [user] [branch]"
-command :'pull-request' do |user, branch|
+command 'pull-request' do |user, branch|
   if helper.project
     die "Specify a user for the pull request" if user.nil?
     user, branch = user.split('/', 2) if branch.nil?
     branch ||= 'master'
     GitHub.invoke(:track, user) unless helper.tracking?(user)
 
-    git_exec "request-pull #{user}/#{branch} origin"
+    git_exec "request-pull #{user}/#{branch} #{helper.origin}"
   end
 end
+
+desc "Create a new, empty GitHub repository"
+usage "github create [repo]"
+flags :markdown => 'Create README.markdown'
+flags :mdown => 'Create README.mdown'
+flags :textile => 'Create README.textile'
+flags :rdoc => 'Create README.rdoc'
+flags :rst => 'Create README.rst'
+command :create do |repo|
+  sh "curl -F 'repository[name]=#{repo}' -F 'login=#{github_user}' -F 'token=#{github_token}' http://github.com/repositories"
+  mkdir repo
+  cd repo
+  git "init"
+  extension = options.keys.first
+  touch extension ? "README.#{extension}" : "README"
+  git "add *"
+  git "commit -m 'First commit!'"
+  git "remote add origin git@github.com:#{github_user}/#{repo}.git"
+  git_exec "push origin master"
+end
+
+desc "Forks a GitHub repository"
+usage "github fork [user]/[repo]"
+command :fork do |user, repo|
+  if repo.nil?
+    user, repo = user.split('/')
+  end
+
+  sh "curl -F 'login=#{github_user}' -F 'token=#{github_token}' http://github.com/#{user}/#{repo}/fork"
+  puts "Giving GitHub a moment to create the fork..."
+  sleep 3
+  git_exec "clone git@github.com:#{github_user}/#{repo}.git"
+end
+
+desc "Create a new GitHub repository from the current local repository"
+command 'create-from-local' do
+  cwd = sh "pwd"
+  repo = File.basename(cwd)
+  is_repo = !git("status").match(/fatal/)
+  raise "Not a git repository. Use gh create instead" unless is_repo
+  sh "curl -F 'repository[name]=#{repo}' -F 'login=#{github_user}' -F 'token=#{github_token}' http://github.com/repositories"
+  git "remote add origin git@github.com:#{github_user}/#{repo}.git"
+  git_exec "push origin master"
+end

data/{commands → lib/commands}/helpers.rb

@@ -1,3 +1,5 @@
+DEV_NULL = File.exist?("/dev/null") ? "/dev/null" : "nul:"
+
 helper :user_and_repo_from do |url|
   case url
   when %r|^git://github\.com/([^/]+/[^/]+)$|: $1.split('/')
@@ -17,10 +19,16 @@ helper :repo_for do |remote|
   user_and_repo_for(remote).try.last
 end
 
+helper :origin do
+  orig = `git config --get github.origin`.chomp
+  orig = nil if orig.empty?
+  orig || 'origin'
+end
+
 helper :project do
-  repo = repo_for(:origin)
+  repo = repo_for(origin)
   if repo.nil?
-    if url_for(:origin) == ""
+    if url_for(origin) == ""
       STDERR.puts "Error: missing remote 'origin'"
     else
       STDERR.puts "Error: remote 'origin' is not a github URL"
@@ -39,7 +47,7 @@ helper :local_heads do
 end
 
 helper :has_commit? do |sha|
-  `git show #{sha} >/dev/null 2>/dev/null`
+  `git show #{sha} >#{DEV_NULL} 2>#{DEV_NULL}`
   $?.exitstatus == 0
 end
 
@@ -135,7 +143,7 @@ helper :print_commits do |our_commits, options|
 end
 
 helper :applies_cleanly do |sha|
-  `git diff ...#{sha} | git apply --check >/dev/null 2>/dev/null`
+  `git diff ...#{sha} | git apply --check >#{DEV_NULL} 2>#{DEV_NULL}`
   $?.exitstatus == 0
 end
 
@@ -150,7 +158,7 @@ helper :remotes do
 end
 
 helper :remote_branches_for do |user|
-  `git ls-remote -h #{user} 2> /dev/null`.split(/\n/).inject({}) do |memo, line|
+  `git ls-remote -h #{user} 2> #{DEV_NULL}`.split(/\n/).inject({}) do |memo, line|
     hash, head = line.split(/\t/, 2)
     head = head[%r{refs/heads/(.+)$},1] unless head.nil?
     memo[head] = hash unless head.nil?
@@ -167,7 +175,7 @@ helper :branch_dirty? do
   # originally, we were going to use git-ls-files but that could only
   # report modified track files...not files that have been staged
   # for committal
-  !(system("git diff --quiet 2>/dev/null") or !system("git diff --cached --quiet 2>/dev/null"))
+  !(system("git diff --quiet 2>#{DEV_NULL}") or !system("git diff --cached --quiet 2>#{DEV_NULL}"))
 end
 
 helper :tracking do
@@ -186,7 +194,7 @@ helper :tracking? do |user|
 end
 
 helper :owner do
-  user_for(:origin)
+  user_for(origin)
 end
 
 helper :current_branch do
@@ -239,6 +247,9 @@ helper :network_meta_for do |user|
   "http://github.com/#{user}/#{project}/network_meta"
 end
 
+helper :network_members_for do |user|
+  "http://github.com/#{user}/#{project}/network/members.json"
+end
 
 helper :has_launchy? do |blk|
   begin
@@ -290,8 +301,8 @@ These are all the commits that other people have pushed that you have not
 applied or ignored yet (see 'github ignore'). Some things you might want to do:
 
 * You can run 'github fetch user/branch' (sans '~N') to pull into a local branch for testing
-* You can run 'git cherry-pick [SHA]' to apply a single patch
-* You can run 'git merge user/branch' to merge a commit and all the '~N' variants.
+* You can run 'github cherry-pick [SHA]' to apply a single patch
+* You can run 'github merge user/branch' to merge a commit and all the '~N' variants.
 * You can ignore all of a projects commits with 'github ignore ..user/branch'
 =========================================================================================
 
@@ -303,9 +314,7 @@ helper :argv do
 end
 
 helper :network_members do
-  get_network_data(owner, {})['users'].map do |hash|
-    hash['name']
-  end
+  get_network_members(owner, {}).map {|member| member['owner']['login'] }
 end
 
 
@@ -314,12 +323,24 @@ helper :get_network_data do |user, options|
     return get_cache
   end
   if cache_network_data(options)
-    return cache_data(user)
+    begin
+      return cache_data(user)
+    rescue SocketError
+      STDERR.puts "*** Warning: There was a problem accessing the network."
+      rv = get_cache
+      STDERR.puts "Using cached data."
+      rv
+    end
   else
     return get_cache
   end
 end
 
+helper :get_network_members do |user, options|
+  json = Kernel.open(network_members_for(user)).read
+  JSON.parse(json)["users"]
+end
+
 helper :cache_commits do |commits|
   File.open( commits_cache_path, 'w' ) do |out|
     out.write(commits.to_yaml)

data/{commands → lib/commands}/network.rb

@@ -20,9 +20,9 @@ command :network do |command, user|
   when 'web'
     helper.open helper.network_page_for(user)
   when 'list'
-    data = helper.get_network_data(user, options)
-    data['users'].each do |hsh|
-      puts [ hsh['name'].ljust(20), hsh['heads'].map {|a| a['name']}.uniq.join(', ') ].join(' ')
+    members = helper.get_network_members(user, options)
+    members.each do |hsh|
+      puts hsh["owner"]["login"]
     end
   when 'fetch'
     # fetch each remote we don't have

data/lib/github.rb

@@ -21,9 +21,10 @@ require 'yaml'
 module GitHub
   extend self
 
-  BasePath = File.expand_path(File.dirname(__FILE__) + '/..')
+  BasePath = File.expand_path(File.dirname(__FILE__))
 
   def command(command, options = {}, &block)
+    command = command.to_s
     debug "Registered `#{command}`"
     descriptions[command] = @next_description if @next_description
     @next_description = nil
@@ -31,7 +32,7 @@ module GitHub
     usage_descriptions[command] = @next_usage if @next_usage
     @next_flags = nil
     @next_usage = []
-    commands[command.to_s] = Command.new(block)
+    commands[command] = Command.new(block)
     Array(options[:alias] || options[:aliases]).each do |command_alias|
       commands[command_alias.to_s] = commands[command.to_s]
     end
@@ -143,7 +144,7 @@ module GitHub
   end
 
   def load(file)
-    file[0] == ?/ ? path = file : path = BasePath + "/commands/#{file}"
+    file[0] =~ /^\// ? path = file : path = BasePath + "/commands/#{File.basename(file)}"
     data = File.read(path)
     GitHub.module_eval data, path
   end

data/lib/github/command.rb

@@ -1,3 +1,5 @@
+require 'fileutils'
+
 if RUBY_PLATFORM =~ /mswin|mingw/
   begin
     require 'win32/open3'
@@ -11,6 +13,8 @@ end
 
 module GitHub
   class Command
+    include FileUtils
+
     def initialize(block)
       (class << self;self end).send :define_method, :command, &block
     end
@@ -66,6 +70,10 @@ module GitHub
       git("config --get github.user")
     end
 
+    def github_token
+      git("config --get github.token")
+    end
+
     def shell_user
       ENV['USER']
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: defunkt-github
 version: !ruby/object:Gem::Version 
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors: 
 - Chris Wanstrath, Kevin Ballard, Scott Chacon
@@ -13,7 +13,7 @@ date: 2008-05-18 00:00:00 -07:00
 default_executable: gh
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: json
+  name: json_pure
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -39,9 +39,9 @@ extra_rdoc_files:
 - README
 files: 
 - bin/github
-- commands/network.rb
-- commands/commands.rb
-- commands/helpers.rb
+- lib/commands/network.rb
+- lib/commands/commands.rb
+- lib/commands/helpers.rb
 - lib/github/extensions.rb
 - lib/github/command.rb
 - lib/github/helper.rb