git_hub 0.2.10 → 0.3.0

data/spec/spec_helper.rb

@@ -1,5 +1,4 @@
 require 'spec'
-require 'cgi'
 require 'fakeweb'
 require 'fakeweb_matcher'
 require File.expand_path(File.join(File.dirname(__FILE__), %w[.. lib git_hub]))
@@ -26,64 +25,41 @@ Spec::Runner.configure do |config|
   config.extend(SpecMacros)
 end
 
-module GitHubTest
+module GitHubTest 
 
   # Test related Constants:
-  TEST_FAKE_WEB = false # turning this flag off switches on real-life github testing
+  TEST_FAKE_WEB = true   # turning this flag on routes all Net calls to local stubs
 
-  # Checks that given block does not raise any errors
-  def use
-    lambda {yield}.should_not raise_error
-  end
+  API = GitHub::Api.instance
 
   # Extract response from file
-  def response_from_file(file_path, uri_path='')
+  def response_from_file( file_path, uri_path = '' )
     filename = File.join(File.dirname(__FILE__), 'stubs', file_path + '.res')
     unless File.exists?(filename) && !File.directory?(filename)
-      raise "No stub file #{filename}. To obtain it use:\n#{curl_string(uri_path, filename)}"
+      raise "No stub file #{filename}. To obtain it use:\n#{curl_string(filename, uri_path)}"
     end
     filename
   end
 
-  def curl_string(uri_path, filename)
+  # Curl command to retrieve non-existent stub file
+  def curl_string( filename, uri_path )
     if api.authenticated?
       "curl -i -d \"login=#{api.auth['login']}&token=#{api.auth['token']}\" #{uri_path} > #{filename}"
     else
-      "curl -i #{github_yaml}#{path} > #{filename}"
+      "curl -i #{uri_path} > #{filename}"
     end
   end
 
-  # Stubs github server, with options:
-  # :host:: Host name - default 'github.com'
-  # :port:: Port - default 80
-  def stub_server(options={})
-    server = Net::HTTP.new(options[:host] ||'github.com', options[:port] || 80)
-    Net::HTTP.stub!(:new).and_return(server)
-    server
-  end
-
-  # Stubs http request, with options:
-  # :path:: Request path - default '/api/v2/yaml/repos/create'
-  # :get:: Indicates that request is get, otherwise post
-  def stub_req(options={})
-    path = options[:path] || '/api/v2/yaml/repos/create'
-    options[:get] ? Net::HTTP::Get.new(path) : Net::HTTP::Post.new(path)
-  end
-
-  def stub_server_and_req(options = {})
-    [stub_server(options), stub_req(options)]
-  end
-
   # Converts path to uri, registers it with FakeWeb with stub file at stubs/(http)/path as a response
   # If extensions given (possibly as an Array), looks for stub files with extensions, responds in sequence
   # If block is given, yields to block and checks that registered uri was hit during block execution
-  def expect(method, path, extensions = nil)
-    uri_path = path
+  def expect( method, path, extensions = nil )
     if TEST_FAKE_WEB
+      uri_path = path
       [extensions].flatten.each do |ext|
         case path
           when Regexp.new(github_yaml)
-            file_path = path.sub(github_yaml, '')
+            file_path = path.sub(github_yaml, '/yaml')
           when Regexp.new(github_http)
             file_path = path.sub(github_http, '/http')
           else
@@ -102,9 +78,14 @@ module GitHubTest
     end
   end
 
-  # Auth for joe
+  # Remove authentication
+  def clear_auth
+    API.auth.clear
+  end
+
+  # Authenticate as joe
   def authenticate_as_joe
-    api.auth = joe_auth
+    API.auth = joe_auth
   end
 
   def joe_auth
@@ -116,7 +97,7 @@ module GitHubTest
     GitHub::User.find(:user=>'joe007')
   end
 
-  def github_http
+  def github_http 
     'http://github.com'
   end
 
@@ -124,16 +105,19 @@ module GitHubTest
     'http://github.com/api/v2/yaml'
   end
 
-  def api
-    GitHub::Api.instance
+  # repo name for 'new_repo' for real life tests - needed because GitHub
+  # gets stuck after several attempts to create repo with the same name
+  def new_repo
+    @new_repo_name ||= TEST_FAKE_WEB ? 'new_repo' : "new_repo#{Time.now.strftime("%Y%m%d-%H%M%S")}"
   end
 
+  # waits a little bit - needed because cache is sticky on real github
   def wait
-    sleep 1 unless TEST_FAKE_WEB # cache is sticky on real github
+    sleep 1 unless TEST_FAKE_WEB
   end
 
   # specific expectations used in more than one spec file
-  def should_be_commit commit, type
+  def should_be_commit( commit, type )
     arvicco = { 'name'=> 'arvicco', 'email'=> 'arvitallian@gmail.com'}
     commit.should be_a GitHub::Commit
     commit.author.should == arvicco
@@ -142,18 +126,19 @@ module GitHubTest
     commit.repo.should == 'fine_repo'
     case type.to_s
       when '5e61'
+        commit.parents.should == [{"id"=>"f7f5dddaa37deacc83f1f56876e2b135389d03ab"}]
         commit.sha.should == '5e61f0687c40ca48214d09dc7ae2d0d0d8fbfeb8'
         commit.url.should == 'http://github.com/joe007/fine_repo/commit/5e61f0687c40ca48214d09dc7ae2d0d0d8fbfeb8'
-        commit.committed_date.should == "2010-01-08T02:49:26-08:00"
-        commit.authored_date.should == "2010-01-08T02:49:26-08:00"
+        commit.committed.should == Time.parse("2010-01-08T02:49:26-08:00")
+        commit.authored.should == Time.parse("2010-01-08T02:49:26-08:00")
         commit.message.should == 'Version bump to 0.1.2'
         commit.tree.should == '917a288e375020ac4c0f4413dc6f23d6f06fc51b'
       when '543b'
         commit.parents.should == []
         commit.sha.should == '4f223bdbbfe6acade73f4b81d089f0705b07d75d'
         commit.url.should == 'http://github.com/joe007/fine_repo/commit/4f223bdbbfe6acade73f4b81d089f0705b07d75d'
-        commit.committed_date.should == "2010-01-08T01:20:55-08:00"
-        commit.authored_date.should == "2010-01-08T01:20:55-08:00"
+        commit.committed.should == Time.parse("2010-01-08T01:20:55-08:00")
+        commit.authored.should == Time.parse("2010-01-08T01:20:55-08:00")
         commit.message.should == 'First commit'
         commit.tree.should == '543b9bebdc6bd5c4b22136034a95dd097a57d3dd'
     end

data/spec/stubs/yaml/repos/show/invalid_github_user/err_repo.res

@@ -0,0 +1,14 @@
+HTTP/1.1 403 Forbidden
+Server: nginx/0.7.61
+Date: Fri, 15 Jan 2010 10:30:10 GMT
+Content-Type: application/x-yaml; charset=utf-8
+Connection: keep-alive
+Status: 403 Forbidden
+X-Runtime: 3ms
+Content-Length: 43
+Set-Cookie: _github_ses=BAh7BiIKZmxhc2hJQzonQWN0aW9uQ29udHJvbGxlcjo6Rmxhc2g6OkZsYXNoSGFzaHsABjoKQHVzZWR7AA%3D%3D--884981fc5aa85daf318eeff084d98e2cff92578f; path=/; expires=Wed, 01 Jan 2020 08:00:00 GMT; HttpOnly
+Cache-Control: no-cache
+
+--- 
+error: 
+- error: repository not found

data/spec/stubs/{user/show/joe_is_not_github_user.res → yaml/user/show/invalid_github_user.res}

@@ -1,8 +1,8 @@
 HTTP/1.1 404 Not Found
 Server: nginx/0.7.61
-Date: Wed, 13 Jan 2010 14:51:55 GMT
+Date: Fri, 15 Jan 2010 10:27:53 GMT
 Content-Type: text/html
-Content-Length: 3758
+Content-Length: 3773
 Connection: keep-alive
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
@@ -73,7 +73,11 @@ Connection: keep-alive
             <a href="http://twitter.com/github">Status</a>
           </div>
           <div class="company">
-            GitHub is <a href="http://logicalawesome.com/">Logical Awesome</a> &copy;2010 | <a href="http://github.com/site/terms">Terms of Service</a> | <a href="http://github.com/site/privacy">Privacy Policy</a>
+            &copy;
+            2010
+            GitHub Inc.
+            All rights reserved.
+            | <a href="http://github.com/site/terms">Terms of Service</a> | <a href="http://github.com/site/privacy">Privacy Policy</a>
           </div>
         </div>
         <div class="sponsor">

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: git_hub
 version: !ruby/object:Gem::Version 
-  version: 0.2.10
+  version: 0.3.0
 platform: ruby
 authors: 
 - arvicco
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-14 00:00:00 +03:00
+date: 2010-01-16 00:00:00 +03:00
 default_executable: git_hub
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -55,46 +55,49 @@ files:
 - lib/git_hub/api.rb
 - lib/git_hub/base.rb
 - lib/git_hub/commit.rb
+- lib/git_hub/extensions.rb
 - lib/git_hub/repo.rb
 - lib/git_hub/user.rb
 - spec/git_hub/api_spec.rb
 - spec/git_hub/base_spec.rb
 - spec/git_hub/commit_spec.rb
+- spec/git_hub/extensions_spec.rb
 - spec/git_hub/repo_spec.rb
 - spec/git_hub/user_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-- spec/stubs/api_route_error.res
-- spec/stubs/commits/list/joe007/fine_repo/master.res
-- spec/stubs/commits/list/joe007/fine_repo/master/README.res
-- spec/stubs/commits/show/joe007/fine_repo/3a70f86293b719f193f778a8710b1f83f2f7bf38.res
-- spec/stubs/commits/show/joe007/fine_repo/5e61f0687c40ca48214d09dc7ae2d0d0d8fbfeb8.res
-- spec/stubs/commits/show/joe007/fine_repo/f7f5dddaa37deacc83f1f56876e2b135389d03ab.res
 - spec/stubs/http/users/follow.res
-- spec/stubs/repos/create.1.res
-- spec/stubs/repos/create.2.res
-- spec/stubs/repos/create.3.res
-- spec/stubs/repos/create.4.res
-- spec/stubs/repos/delete/new_repo.1.res
-- spec/stubs/repos/delete/new_repo.2.res
-- spec/stubs/repos/delete/new_repo.res
-- spec/stubs/repos/search/fine+repo.res
-- spec/stubs/repos/search/joe+repo.res
-- spec/stubs/repos/show/joe007.res
-- spec/stubs/repos/show/joe007/err_repo.res
-- spec/stubs/repos/show/joe007/fine_repo.res
-- spec/stubs/repos/show/joe007/fine_repo/branches.res
-- spec/stubs/repos/show/joe007/fine_repo/tags.res
-- spec/stubs/repos/show/joe007/new_repo.res
-- spec/stubs/user/follow/arvicco.res
-- spec/stubs/user/search/joe+007.res
-- spec/stubs/user/show/arvicco.res
-- spec/stubs/user/show/joe007.auth.res
-- spec/stubs/user/show/joe007.res
-- spec/stubs/user/show/joe007/followers.res
-- spec/stubs/user/show/joe007/following.empty.res
-- spec/stubs/user/show/joe007/following.res
-- spec/stubs/user/show/joe_is_not_github_user.res
+- spec/stubs/yaml/api_route_error.res
+- spec/stubs/yaml/commits/list/joe007/fine_repo/master.res
+- spec/stubs/yaml/commits/list/joe007/fine_repo/master/README.res
+- spec/stubs/yaml/commits/show/joe007/fine_repo/3a70f86293b719f193f778a8710b1f83f2f7bf38.res
+- spec/stubs/yaml/commits/show/joe007/fine_repo/5e61f0687c40ca48214d09dc7ae2d0d0d8fbfeb8.res
+- spec/stubs/yaml/commits/show/joe007/fine_repo/f7f5dddaa37deacc83f1f56876e2b135389d03ab.res
+- spec/stubs/yaml/repos/create.1.res
+- spec/stubs/yaml/repos/create.2.res
+- spec/stubs/yaml/repos/create.3.res
+- spec/stubs/yaml/repos/create.4.res
+- spec/stubs/yaml/repos/delete/new_repo.1.res
+- spec/stubs/yaml/repos/delete/new_repo.2.res
+- spec/stubs/yaml/repos/delete/new_repo.res
+- spec/stubs/yaml/repos/search/fine+repo.res
+- spec/stubs/yaml/repos/search/joe+repo.res
+- spec/stubs/yaml/repos/show/invalid_github_user/err_repo.res
+- spec/stubs/yaml/repos/show/joe007.res
+- spec/stubs/yaml/repos/show/joe007/err_repo.res
+- spec/stubs/yaml/repos/show/joe007/fine_repo.res
+- spec/stubs/yaml/repos/show/joe007/fine_repo/branches.res
+- spec/stubs/yaml/repos/show/joe007/fine_repo/tags.res
+- spec/stubs/yaml/repos/show/joe007/new_repo.res
+- spec/stubs/yaml/user/follow/arvicco.res
+- spec/stubs/yaml/user/search/joe+007.res
+- spec/stubs/yaml/user/show/arvicco.res
+- spec/stubs/yaml/user/show/invalid_github_user.res
+- spec/stubs/yaml/user/show/joe007.auth.res
+- spec/stubs/yaml/user/show/joe007.res
+- spec/stubs/yaml/user/show/joe007/followers.res
+- spec/stubs/yaml/user/show/joe007/following.empty.res
+- spec/stubs/yaml/user/show/joe007/following.res
 has_rdoc: true
 homepage: http://github.com/arvicco/git_hub
 licenses: []
@@ -127,6 +130,7 @@ test_files:
 - spec/git_hub/api_spec.rb
 - spec/git_hub/base_spec.rb
 - spec/git_hub/commit_spec.rb
+- spec/git_hub/extensions_spec.rb
 - spec/git_hub/repo_spec.rb
 - spec/git_hub/user_spec.rb
 - spec/spec_helper.rb