github 0.5.0 → 0.6.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    github (0.5.0)
+    github (0.6.0)
       highline (~> 1.5.1)
       json (~> 1.4.6)
       launchy (~> 0.3.7)
@@ -31,9 +31,5 @@ PLATFORMS
 DEPENDENCIES
   activerecord (~> 2.3.10)
   github!
-  highline (~> 1.5.1)
-  json (~> 1.4.6)
-  launchy (~> 0.3.7)
   rake
   rspec (~> 1.3.1)
-  text-format (= 1.0.0)

data/History.txt

@@ -1,7 +1,13 @@
+== 0.6.0
+
+* If credentials not setup, then user prompted for them
+* Corrected the "gem source --add" call [kedarmhaswade]
+* Verify network-cache is non-empty [bfroehle]
+
 == 0.5.0 2011-1-17
 
-* Support for ruby 1.9.2 [keithpitty]
-* Clean fail if haven't setup github config yet [keithpitty]
+* Support for ruby 1.9.2 [keithpitt]
+* Clean fail if haven't setup github config yet [keithpitt]
 
 == 0.4.6 2010-11-04
 

data/README.md

@@ -6,7 +6,7 @@ Catch us in the #github room on freenode if you want to get involved.  Or just f
 
 ## Getting started
 
-    $ gem source add http://gemcutter.org
+    $ gem source --add http://gemcutter.org
     $ gem install github
 
 Run it:

data/lib/commands/helpers.rb

@@ -389,7 +389,7 @@ helper :cache_expired? do
 end
 
 helper :has_cache? do
-  File.file?(network_cache_path)
+  File.file?(network_cache_path) && !File.zero?(network_cache_path)
 end
 
 helper :has_commits_cache? do

data/lib/github/command.rb

@@ -69,20 +69,40 @@ module GitHub
     def github_user
       user = git("config --get github.user")
       if user.empty?
-        die("You must 'git config --global github.user [your Github username]' before running this command")
+        request_github_credentials
+        user = github_user
       end
-
       user
     end
 
     def github_token
       token = git("config --get github.token")
       if token.empty?
-        die("You must 'git config --global github.token [your API token]' before running this command")
+        request_github_credentials
+        token = github_token
       end
-
       token
     end
+    
+    def request_github_credentials
+      puts "Please enter your GitHub credentials:"
+      user = highline.ask("Username: ") while user.nil? || user.empty?
+      
+      git("config --global github.user '#{user}'")
+      puts("Your account token is at https://github.com/account under 'Account Admin'.")
+      puts("Press Enter to launch page in browser.")
+      token = highline.ask("Token: ")
+      while token.strip.empty?
+        helper.open "https://github.com/account"
+        token = highline.ask("Token: ")
+      end
+      git("config --global github.token '#{token}'")
+      true
+    end
+    
+    def highline
+      @highline ||= HighLine.new
+    end
 
     def shell_user
       ENV['USER']

data/lib/github/version.rb

@@ -1,3 +1,3 @@
 module GitHub
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

data/spec/command_spec.rb

@@ -79,18 +79,38 @@ describe GitHub::Command do
     @command.should_receive(:exit!).once
     @command.die "message"
   end
-
-  it "should die if a github API token cannot be found" do
-    @command.should_receive(:git).once.with("config --get github.token").and_return("")
-    @command.should_receive(:puts).once.with("=> You must 'git config --global github.token [your API token]' before running this command")
-    @command.should_receive(:exit!).once
-    @command.github_token
+  
+  it "requests github API credentials if not found" do
+    @command.should_receive(:git).once.with("config --get github.user").and_return("")
+    @command.should_receive(:puts).once.with("Please enter your GitHub credentials:")
+    h = mock("HighLine")
+    h.should_receive(:ask).once.with("Username: ").and_return("drnic")
+    @command.should_receive(:puts).once.with("Your account token is at https://github.com/account under 'Account Admin'.")
+    @command.should_receive(:puts).once.with("Press Enter to launch page in browser.")
+    h.should_receive(:ask).once.with("Token: ").and_return("TOKEN")
+    @command.should_receive(:highline).twice.and_return(h)
+    @command.should_receive(:git).once.with("config --global github.user 'drnic'")
+    @command.should_receive(:git).once.with("config --global github.token 'TOKEN'")
+    @command.should_receive(:git).once.with("config --get github.user").and_return("drnic")
+    @command.github_user
   end
 
-  it "should die if a github username token cannot be found" do
+  it "requests github API credentials if not found, and shows accounts page" do
     @command.should_receive(:git).once.with("config --get github.user").and_return("")
-    @command.should_receive(:puts).once.with("=> You must 'git config --global github.user [your Github username]' before running this command")
-    @command.should_receive(:exit!).once
+    @command.should_receive(:puts).once.with("Please enter your GitHub credentials:")
+    h = mock("HighLine")
+    h.should_receive(:ask).once.with("Username: ").and_return("drnic")
+    @command.should_receive(:puts).once.with("Your account token is at https://github.com/account under 'Account Admin'.")
+    @command.should_receive(:puts).once.with("Press Enter to launch page in browser.")
+    h.should_receive(:ask).once.with("Token: ").and_return("")
+    helper = mock("GitHub::Helper")
+    helper.should_receive("open").once.with("https://github.com/account")
+    @command.should_receive(:helper).once.and_return(helper)
+    h.should_receive(:ask).once.with("Token: ").and_return("TOKEN")
+    @command.should_receive(:highline).any_number_of_times.and_return(h)
+    @command.should_receive(:git).once.with("config --global github.user 'drnic'")
+    @command.should_receive(:git).once.with("config --global github.token 'TOKEN'")
+    @command.should_receive(:git).once.with("config --get github.user").and_return("drnic")
     @command.github_user
   end
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: github
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 7
+  prerelease: 
   segments: 
   - 0
-  - 5
+  - 6
   - 0
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Chris Wanstrath
@@ -17,112 +18,119 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-17 00:00:00 -08:00
+date: 2011-01-30 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: text-format
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 1
         - 0
         - 0
         version: 1.0.0
   type: :runtime
+  requirement: *id001
+  name: text-format
   prerelease: false
-  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: highline
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 1
         segments: 
         - 1
         - 5
         - 1
         version: 1.5.1
   type: :runtime
+  requirement: *id002
+  name: highline
   prerelease: false
-  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: json
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 11
         segments: 
         - 1
         - 4
         - 6
         version: 1.4.6
   type: :runtime
+  requirement: *id003
+  name: json
   prerelease: false
-  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: launchy
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 29
         segments: 
         - 0
         - 3
         - 7
         version: 0.3.7
   type: :runtime
+  requirement: *id004
+  name: launchy
   prerelease: false
-  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: rake
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
+  requirement: *id005
+  name: rake
   prerelease: false
-  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: rspec
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 25
         segments: 
         - 1
         - 3
         - 1
         version: 1.3.1
   type: :development
+  requirement: *id006
+  name: rspec
   prerelease: false
-  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: activerecord
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 2
         - 3
         - 10
         version: 2.3.10
   type: :development
+  requirement: *id007
+  name: activerecord
   prerelease: false
-  version_requirements: *id007
 description: The official `github` command line helper for simplifying your GitHub experience.
 email: 
 - drnicwilliams@gmail.com
@@ -194,7 +202,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2745710888565364419
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -203,14 +211,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2745710888565364419
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: github
-rubygems_version: 1.3.7
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: The official `github` command line helper for simplifying your GitHub experience.