git_hub 0.2.10 → 0.3.0

data/lib/git_hub/repo.rb

@@ -50,7 +50,7 @@ module GitHub
     end
 
     def clone_url
-      url = private? || api.auth['login'] == user ? "git@github.com:" : "git://github.com/"
+      url = private? || API.auth['login'] == user ? "git@github.com:" : "git://github.com/"
       url += "#{@user}/#{@name}.git"
     end
 
@@ -67,7 +67,7 @@ module GitHub
     # :path:: Only commits for specific path
     # :sha/:id:: Only one commit with specific id (sha)
     def commits opts = {}
-       Commit.find opts.merge(:user => @user, :repo => @name)
+      Commit.find opts.merge(:user => @user, :repo => @name)
     end
 
     class << self # Repo class methods
@@ -76,8 +76,8 @@ module GitHub
       # :owner/:user/:username:: Github user name
       # :repo/:repository/:project/:name:: Repo name
       # :query/:search:: Array of search terms as Strings or Symbols
-      def find(opts)
-        user, repo, query = extract opts, :user, :repo, :query
+      def find( *args )
+        user, repo, query = extract args, :user, :repo, :query
         path = if query
           "/search/#{query.map(&:to_s).join('+')}"
         elsif user && repo
@@ -94,24 +94,22 @@ module GitHub
       alias search find
 
       # Create new github repo, accepts Hash with :repo, :description, :homepage, :public/:private
-      def create(opts)
-        repo, desc, homepage, public = extract opts, :repo, :desc, :homepage, :public
-        api.ensure_auth opts
+      def create!(*args)
+        repo, desc, homepage, public = extract args, :repo, :desc, :homepage, :public
+        API.ensure_auth
         instantiate post("/create", 'name' => repo, 'description' => desc,
-                             'homepage' => homepage, 'public' => (public ? 1 : 0))
+                         'homepage' => homepage, 'public' => (public ? 1 : 0))
       end
-    end 
+    end
 
     # Delete github repo, accepts optional Hash with authentication
-    def delete(opts = {})
-      api.ensure_auth opts
+    def delete!
+      API.ensure_auth
       result = post("/delete/#{@name}")
-      if token = result['delete_token']
-        post("/delete/#{@name}", 'delete_token' => token)
-      else
-        result
-      end
-    end 
+      token = result['delete_token']
+      return result unless token
+      post("/delete/#{@name}", 'delete_token' => token)
+    end
 
     def add_service
     end
@@ -133,14 +131,13 @@ module GitHub
 
     def hash_of_commits(resource)
       result = get "/show/#{@user}/#{@name}/#{resource}"
-      if tagged_shas = result[resource.to_s]
-        tagged_commits = tagged_shas.map do |tag,sha|
-          [tag, Commit.find(:user=>@user, :repo=>@name, :sha=>sha)]
-        end
-        Hash[*tagged_commits.flatten]
-      else
-        result
+      tagged_shas = result[resource.to_s]
+      return result unless tagged_shas
+
+      tagged_commits = tagged_shas.map do |tag, sha|
+        [tag, Commit.find(:user=>@user, :repo=>@name, :sha=>sha)]
       end
+      Hash[*tagged_commits.flatten]
     end
 
     # repos/show/:user/:repo/languages

data/lib/git_hub/user.rb

@@ -15,7 +15,7 @@ module GitHub
 
     aliases_for :homepage => :blog, :name => [:user, :username], :created => :created_at
 
-    def initialize(opts)
+    def initialize( opts )
       @public_repo_count = opts.delete('repos')  # TODO: find better way without modifying opts?
       @followers_count = opts.delete('followers')
       super
@@ -29,7 +29,7 @@ module GitHub
       @type ||= "user"
     end
 
-    def url() "http://github.com/#{@name}" end
+    def url; "http://github.com/#{@name}" end
 
     class << self
 
@@ -37,8 +37,8 @@ module GitHub
       # :user/:username:: Github user name
       # :repo/:repository/:project/:name:: Repo name
       # :query/:search:: Array of search terms as Strings or Symbols
-      def find(opts)
-        user, query = extract opts, :user, :query
+      def find( *args )
+        user, query = extract args, :user, :query
         path = if query
           "/search/#{query.map(&:to_s).join('+')}"
         elsif user
@@ -59,11 +59,13 @@ module GitHub
       get("/show/#{@name}/following")['users'].map {|user| User.find(:user => user )}
     end
 
-    def follow user
+    def follow!( user )
+      API.ensure_auth
       post("/follow/#{user}")['users'].map {|user| User.find(:user => user )}
     end
 
-    def unfollow user # api /user/unfollow/:user is not working properly atm, using http
+    def unfollow!( user )# api /user/unfollow/:user is not working properly atm, using http
+      API.ensure_auth
       res = get 'http://github.com/users/follow', 'target' => user
       raise "User Not Found #{user}" unless res.code == 302.to_s
       following

data/spec/git_hub/api_spec.rb

@@ -2,6 +2,27 @@ require File.expand_path(
         File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 
 module GitHubTest
+  # 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
+
   describe GitHub::Api do
     after(:each) do
       GitHub::Api.instance.auth.clear

data/spec/git_hub/base_spec.rb

@@ -4,17 +4,17 @@ require File.expand_path(
 module GitHubTest
   describe GitHub::Base do
     after(:each) do
-      api.auth.clear
+      clear_auth
     end
 
     context 'requests' do
       it 'submits appropriate requests to api as get/post methods (both class and instance)' do
         base = described_class.new
-        api.should_receive(:request).with(:get, '/blah', anything()).twice
+        API.should_receive(:request).with(:get, '/blah', anything()).twice
         base.get ('/blah')
         described_class.get ('/blah')
 
-        api.should_receive(:request).with(:post, '/blah', anything()).twice
+        API.should_receive(:request).with(:post, '/blah', anything()).twice
         base.post ('/blah')
         described_class.post ('/blah')
       end
@@ -22,11 +22,11 @@ module GitHubTest
       it 'prepends get/post calls by content of @base_uri variable' do
         base = described_class.new
         described_class.class_eval { @base_uri = 'http://base1.com' }
-        api.should_receive(:request).with(:get, 'http://base1.com/blah', anything()).twice
+        API.should_receive(:request).with(:get, 'http://base1.com/blah', anything()).twice
         base.get ('/blah')
         described_class.get ('/blah')
 
-        api.should_receive(:request).with(:post, 'http://base1.com/blah', anything()).twice
+        API.should_receive(:request).with(:post, 'http://base1.com/blah', anything()).twice
         base.post ('/blah')
         described_class.post ('/blah')
       end

data/spec/git_hub/commit_spec.rb

@@ -7,8 +7,8 @@ module GitHubTest
       FakeWeb.allow_net_connect = false if TEST_FAKE_WEB
     end
     after(:each) do
-      FakeWeb.clean_registry
-      api.auth.clear
+      FakeWeb.clean_registry if TEST_FAKE_WEB
+      clear_auth
     end
 
     context '.find' do

data/spec/git_hub/extensions_spec.rb

@@ -0,0 +1,55 @@
+require File.expand_path(
+        File.join(File.dirname(__FILE__), '..', 'spec_helper'))
+
+module GitHubTest
+  module A
+    class B
+      class C
+      end
+    end
+  end
+
+  describe String do
+    context '#to_class' do
+      it 'converts string into appropriate Class constant' do
+        "Fixnum".to_class.should == Fixnum
+        "GitHubTest::A::B::C".to_class.should == GitHubTest::A::B::C
+      end
+
+      it 'returns nil if string is not convertible into class' do
+        "Math".to_class.should == nil
+        "Math::PI".to_class.should == nil
+        "Something".to_class.should == nil
+      end
+
+      it 'deals with leading colons' do
+        "::GitHubTest::A::B::C".to_class.should == GitHubTest::A::B::C
+      end
+    end
+  end
+
+  describe Array do
+    context '#args_and_opts' do
+      it 'splits array into two components: enum with args and options hash' do
+        args, opts = [1, 2, {3=>4}].args_and_opts
+        args.should be_an Enumerator
+        args.to_a.should == [1, 2]
+        opts.should == {3=>4}
+      end
+
+      it 'correctly splits options if 2 Hashes are last' do
+        args, opts = [1, 2, {3=>4}, {5=>6}].args_and_opts
+        args.should be_an Enumerator
+        args.to_a.should == [1, 2, {3=>4}]
+        opts.should == {5=>6}
+      end
+
+      it 'returns empty options if last component is not a Hash' do
+        args, opts = [1, 2, {3=>4}, 5].args_and_opts
+        args.should be_an Enumerator
+        args.to_a.should == [1, 2, {3=>4}, 5]
+        opts.should == {}
+      end
+    end
+  end
+end

data/spec/git_hub/repo_spec.rb

@@ -12,7 +12,7 @@ module GitHubTest
     repo.type.should == 'repo'
     repo.name.should == name.to_s
     repo.url.should == "http://github.com/joe007/#{name.to_s}"
-    repo.clone_url.should == if api.authenticated?
+    repo.clone_url.should == if API.authenticated?
       "git@github.com:joe007/#{name.to_s}.git"
     else
       "git://github.com/joe007/#{name.to_s}.git"
@@ -46,7 +46,7 @@ module GitHubTest
             repo.homepage.should == nil
             repo.open_issues.should == nil
         end
-      when 'new_repo'
+      when "#{new_repo}"
         repo.watchers.should == 1
         repo.followers.should == 1
         repo.open_issues.should == 0
@@ -57,7 +57,7 @@ module GitHubTest
             repo.homepage.should == nil
           when 'with_attributes'
             repo.description.should == 'New repo'
-            repo.homepage.should == 'http://joe.org/new_repo'
+            repo.homepage.should == "http://joe.org/new_repo"
         end
     end
   end
@@ -67,18 +67,25 @@ module GitHubTest
       FakeWeb.allow_net_connect = false if TEST_FAKE_WEB
     end
     after(:each) do
-      FakeWeb.clean_registry
-      api.auth.clear
+      FakeWeb.clean_registry if TEST_FAKE_WEB
+      clear_auth
     end
 
     context '.find as /show/:user/:repo' do
-      it 'finds repo of a (valid) github user' do
+      it 'finds repo of a (valid) github user given options Hash' do
         expect(:get, "#{github_yaml}/repos/show/joe007/fine_repo") do
           repo = GitHub::Repo.find(:user=>'joe007', :repo=>'fine_repo')
           should_be_repo repo
         end
       end
 
+      it 'finds repo of a (valid) github user given simple arguments' do
+        expect(:get, "#{github_yaml}/repos/show/joe007/fine_repo") do
+          repo = GitHub::Repo.find('joe007', 'fine_repo')
+          should_be_repo repo
+        end
+      end
+
       it 'finds repo if user object is given instead of username' do
         expect(:get, "#{github_yaml}/repos/show/joe007/fine_repo") do
           repo = GitHub::Repo.find(:user=>joe, :repo=>'fine_repo')
@@ -94,6 +101,15 @@ module GitHubTest
           res['error'].first.should have_key 'error'
         end
       end
+
+      it 'fails returning error object if user is invalid' do
+        expect(:get, "#{github_yaml}/repos/show/invalid_github_user/err_repo") do
+          res = GitHub::Repo.find('invalid_github_user', 'err_repo')
+          res.should have_key 'error' # res = {"error"=>[{"error"=>"repository not found"}]}
+          res['error'].should be_kind_of Array
+          res['error'].first.should have_key 'error'
+        end
+      end
     end
 
     context '.find as /show/:user)' do
@@ -122,38 +138,46 @@ module GitHubTest
       end
     end
 
-    context '.create' do
+    context '.create!' do
+      before(:each) {wait}
       after(:each) do
-        expect(:post, "http://github.com/api/v2/yaml/repos/delete/new_repo", 1)
-        @repo.delete if @repo.is_a? GitHub::Repo
+        authenticate_as_joe
+        expect(:post, "http://github.com/api/v2/yaml/repos/delete/#{new_repo}", 1)
+        @repo.delete! if @repo.is_a? GitHub::Repo
         wait
       end
 
       it 'creates new repo for authenticated github user' do
         authenticate_as_joe
-#        keys = {:name => 'new_repo', :public => 1}.merge joe_auth # Fake_Web doesn't support key expectations yet
+#        keys = {:name => "#{new_repo}", :public => 1}.merge joe_auth # Fake_Web doesn't support key expectations yet
         expect(:post, "#{github_yaml}/repos/create", 1) do
-          @repo = GitHub::Repo.create(:repo=>'new_repo')
-          should_be_repo @repo, 'new_repo', :simple
+          @repo = GitHub::Repo.create!(:repo=>"#{new_repo}")
+          should_be_repo @repo, "#{new_repo}", :simple
         end
       end
 
       it 'creates new repo with extended attributes' do
-        wait
         authenticate_as_joe
-#        keys = {:name => 'new_repo', :description => 'New repo',  # Fake_Web doesn't support key expectations yet
-#                :homepage => 'http://joe.org/new_repo', :public => 1}.merge joe_auth
+#        keys = {:name => "#{new_repo}", :description => 'New repo',  # Fake_Web doesn't support key expectations yet
+#                :homepage => "http://joe.org/#{new_repo}", :public => 1}.merge joe_auth
         expect(:post, "#{github_yaml}/repos/create", 2)
-        @repo = GitHub::Repo.create(:name=>'new_repo', :description => 'New repo',
+        @repo = GitHub::Repo.create!(:name=>"#{new_repo}", :description => 'New repo',
                                     :homepage => 'http://joe.org/new_repo', :private => false)
-        should_be_repo @repo, 'new_repo', :with_attributes
+        should_be_repo @repo, "#{new_repo}", :with_attributes
+      end
+
+      it 'creates new repo without options' do
+        authenticate_as_joe
+        expect(:post, "#{github_yaml}/repos/create", 2)
+        @repo = GitHub::Repo.create!("#{new_repo}", 'New repo', 'http://joe.org/new_repo', false)
+        should_be_repo @repo, "#{new_repo}", :with_attributes
       end
 
       it 'fails if repo with the same name already exists' do
         authenticate_as_joe
 #        keys = {:name => 'fine_repo', :public => 1}.merge joe_auth # Fake_Web doesn't support key expectations yet
         expect(:post, "#{github_yaml}/repos/create", 4)
-        res = GitHub::Repo.create(:name=>'fine_repo')
+        res = GitHub::Repo.create!(:name=>'fine_repo')
         res.should have_key 'error' # res = {"error"=>[{"error"=>"repository not found"}]}
         res['error'].should be_kind_of Array
         res['error'].first.should have_key 'error'
@@ -161,21 +185,23 @@ module GitHubTest
       end
     end
 
-    context '#delete' do
+    context '#delete!' do
       before(:each) do
         authenticate_as_joe
         expect(:post, "#{github_yaml}/repos/create", 1)
-        @repo = GitHub::Repo.create(:user=>'joe007', :repo=>'new_repo')
-        wait
+        @repo = GitHub::Repo.create!(:user=>'joe007', :repo=>"#{new_repo}")
+        raise 'Repo creation failed' unless @repo.is_a?(GitHub::Repo)
+        clear_auth
       end
 
       it 'deletes new repo for authenticated github user' do
 #        post1 = { :expected_keys => joe_auth,  # Fake_Web doesn't support key expectations yet
-#                  :body => body_from_file('/repos/delete/new_repo.1') }
+#                  :body => body_from_file('/repos/delete/"#{new_repo}".1') }
 #        post2 = { :expected_keys => {:delete_token => :any}.merge(joe_auth),
-#                  :body => body_from_file('/repos/delete/new_repo.2') }
-        expect(:post, "#{github_yaml}/repos/delete/new_repo", [1, 2])
-        res = @repo.delete
+#                  :body => body_from_file('/repos/delete/"#{new_repo}".2') }
+        authenticate_as_joe
+        expect(:post, "#{github_yaml}/repos/delete/#{new_repo}", [1, 2])
+        res = @repo.delete!
         res['status'].should == 'deleted'
       end
     end
@@ -245,21 +271,6 @@ module GitHubTest
       end
     end
 
-    it 'tests' do
-      pending
-      authenticate_as_joe
-      expect(:get, "#{github_yaml}/repos/showp/joe007/new_repo")
-      repos = GitHub::Repo.show('arvicco')
-      p repos
-      p repos.map(&:url)
-      repos.should be_an Array
-      repos.should_not be_empty
-      if repos.last.name == 'new_repo'
-        repos.last.delete
-      end
-      true.should == false
-    end
-
   end # describe GitHub::Repo
 end # module GithubTest
 

data/spec/git_hub/user_spec.rb

@@ -24,7 +24,7 @@ module GitHubTest
             user.language.should == ''
             user.pushed.should == Time.parse('2009-12-30T14:15:16.972Z')
             user.score.should be_close 4.18, 0.2
-          when :show, :show_auth
+          when :show
             # attributes differs between /show and /search
             user.public_repo_count.should == 3
             user.followers_count.should == 1
@@ -37,15 +37,6 @@ module GitHubTest
             user.following_count.should == 1
             user.public_gist_count.should == 0
             user.blog.should == 'http://www.joe007.org'
-            if type == :show_auth
-              # additional attributes for athenticated user
-              user.plan.should == {'name' => 'free', 'collaborators' => 0, 'space' => 307200, 'private_repos' => 0}
-              user.collaborators.should == 0
-              user.disk_usage.should == 76
-              user.private_gist_count.should == 0
-              user.owned_private_repo_count.should == 0
-              user.total_private_repo_count.should == 0
-            end
         end
       when :arvicco
         user.id.should == 'user-39557'
@@ -61,8 +52,8 @@ module GitHubTest
       FakeWeb.allow_net_connect = false if TEST_FAKE_WEB
     end
     after(:each) do
-      FakeWeb.clean_registry
-      api.auth.clear
+      FakeWeb.clean_registry if TEST_FAKE_WEB
+      clear_auth
       wait
     end
 
@@ -74,17 +65,31 @@ module GitHubTest
         end
       end
 
+      it 'finds valid github user by name' do
+        expect(:get, "#{github_yaml}/user/show/joe007") do
+          user = GitHub::User.find('joe007')
+          should_be_user user, :joe007
+        end
+      end
+
       it 'finds authenticated github user with additional attributes set' do
         expect(:get, "#{github_yaml}/user/show/joe007", :auth) do
-          api.auth = joe_auth
+          authenticate_as_joe
           user = GitHub::User.find(:user=>'joe007')
-          should_be_user user, :joe007, :show_auth
+          should_be_user user, :joe007
+          # additional attributes for athenticated user
+          user.plan.should == {'name' => 'free', 'collaborators' => 0, 'space' => 307200, 'private_repos' => 0}
+          user.collaborators.should == 0
+          user.disk_usage.should == 76
+          user.private_gist_count.should == 0
+          user.owned_private_repo_count.should == 0
+          user.total_private_repo_count.should == 0
         end
       end
 
       it 'fails to find invalid github user' do
-        expect(:get, "#{github_yaml}/user/show/joe_is_not_github_user") do
-          res = GitHub::User.find(:user=>'joe_is_not_github_user')
+        expect(:get, "#{github_yaml}/user/show/invalid_github_user") do
+          res = GitHub::User.find(:user=>'invalid_github_user')
           res.code.should == 404.to_s
           res.message.should == 'Not Found'
         end
@@ -126,6 +131,7 @@ module GitHubTest
           end
         end
       end
+
       context 'actions' do
         before(:each) do
           expect(:get, "http://github.com/users/follow")
@@ -136,14 +142,14 @@ module GitHubTest
           # after - normal state is for joe to follow arvicco
           authenticate_as_joe
           expect(:post, "#{github_yaml}/user/follow/arvicco")
-          joe.follow :arvicco
+          joe.follow! :arvicco
           wait
         end
 
         it 'stops following previously followed user (if authenticated)' do
           expect(:get, "http://github.com/users/follow") do
             expect(:get, "#{github_yaml}/user/show/joe007/following", :empty)
-            following = joe.unfollow :arvicco
+            following = joe.unfollow! :arvicco
             following.should be_kind_of Array
             following.should be_empty
           end
@@ -152,11 +158,11 @@ module GitHubTest
         it 'starts following new user (if authenticated)' do
           # before - normal state is for joe to follow arvicco
           expect(:get, "#{github_yaml}/user/show/joe007/following")
-          joe.unfollow :arvicco
+          joe.unfollow! :arvicco
           wait
 
           expect(:post, "#{github_yaml}/user/follow/arvicco") do
-            following = joe.follow :arvicco
+            following = joe.follow! :arvicco
             following.should be_kind_of Array
             following.should have(1).user
             following.each {|user| user.should be_a GitHub::User}