regrit 0.0.6 → 0.1.0

data/README.md

@@ -1,3 +1,30 @@
 # Regrit
 
+Regrit provides an interface for remote repository. This gem is used by awsm to load remote refs and check deploy key installation.
+
+## Usage
+
+    @repo ||= Regrit::RemoteRepo.new(repository_uri, :private_key => deploy_key_private)
+
+    if repo.private_key_required?
+      puts "this repo will require a deploy key to retrieve any information"
+    end
+
+    if repo.accessible?
+      puts "repo is accessible"
+    end
+
+    ref_list =
+      begin
+        repo.refs
+      rescue Regrit::Inaccessible
+        []
+      end
+
+    commit_sha =
+      begin
+        repo.ref('master')
+      rescue Regrit::Inaccessible
+        nil
+      end
 

data/lib/regrit/provider/mock.rb

@@ -26,6 +26,7 @@ module Regrit
 
       def initialize(uri, options)
         @uri = uri
+        @options = options
       end
 
       def ls_remote(named=nil)
@@ -64,6 +65,14 @@ module Regrit
       end
 
       def raise_errors
+        if @uri.ssh?
+          begin
+            @git_ssh_wrapper ||= GitSSHWrapper.new(@options)
+          rescue GitSSHWrapper::PrivateKeyRequired
+            raise Regrit::PrivateKeyRequired.new(@uri)
+          end
+        end
+
         unless self.class.accessible
           raise CommandError.new('mock command', 1, '', 'stderr')
         end

data/lib/regrit/provider/system.rb

@@ -1,7 +1,6 @@
 require 'open4'
 require 'escape'
 require 'git-ssh-wrapper'
-require 'system_timer'
 
 module Regrit
   module Provider
@@ -10,8 +9,8 @@ module Regrit
 
       def initialize(uri, options)
         @uri = uri
-        @timeout = options[:timeout] || DEFAULT_TIMEOUT
-        load_git_ssh_wrapper(options) if @uri.ssh?
+        @options = options
+        @timeout = @options[:timeout] || DEFAULT_TIMEOUT
       end
 
       def ls_remote(named=nil)
@@ -45,7 +44,7 @@ module Regrit
       # Might raise CommandError or TimeoutError
       def spawn(command)
         stdout, stderr = '', ''
-        SystemTimer.timeout(@timeout) do
+        timeout(@timeout) do
           Open4.spawn(command, :stdout => stdout, :stderr => stderr, :timeout => @timeout)
         end
         stdout
@@ -57,11 +56,15 @@ module Regrit
 
       def git_command
         # GIT_ASKPASS='echo' keeps password prompts from stalling the proccess (they still fail)
-        "env GIT_ASKPASS='echo' #{@uri.ssh? ? @git_ssh_wrapper.git_ssh : ''} git"
+        "env GIT_ASKPASS='echo' #{git_ssh_wrapper_env} git"
       end
 
-      def load_git_ssh_wrapper(options)
-        @git_ssh_wrapper = GitSSHWrapper.new(options)
+      def git_ssh_wrapper_env
+        @uri.ssh? ? git_ssh_wrapper.git_ssh : ''
+      end
+
+      def git_ssh_wrapper
+        @git_ssh_wrapper ||= GitSSHWrapper.new(@options)
       rescue GitSSHWrapper::PrivateKeyRequired
         raise Regrit::PrivateKeyRequired.new(@uri)
       end

data/lib/regrit/remote_repo.rb

@@ -23,7 +23,7 @@ module Regrit
         raise InvalidURIError
       end
 
-      @provider = Provider.new(@uri, options)
+      @options = options
     end
 
     # Decide if the URI is likely to require authentication
@@ -58,7 +58,9 @@ module Regrit
 
     private
 
-    attr_reader :provider
+    def provider
+      @provider ||= Provider.new(@uri, @options)
+    end
 
     def load_refs(named=nil)
       raw_refs = provider.ls_remote(named)

data/lib/regrit/version.rb

@@ -1,3 +1,3 @@
 module Regrit
-  VERSION = "0.0.6"
+  VERSION = "0.1.0"
 end

data/regrit.gemspec

@@ -11,14 +11,18 @@ Gem::Specification.new do |s|
   s.summary     = %q{Never regrit how you talk with remote git repositories}
   s.description = %q{Deal with remote git repositories, yo.}
 
-  s.add_dependency "gitable", "~> 0.2.1"
+  s.add_dependency "gitable",         "~> 0.2.1"
   s.add_dependency "open4"
   s.add_dependency "escape"
-  s.add_dependency "git-ssh-wrapper", "~> 0.0.1"
-  s.add_dependency "SystemTimer"
+  s.add_dependency "git-ssh-wrapper", "~> 0.1.0"
+  s.add_dependency "system-timer19",  "~> 0.0.2"
 
+  if RUBY_VERSION =~ /^1\.8/
+    s.add_dependency "SystemTimer"
+  end
+  
   s.add_development_dependency "rspec", "~> 2.0"
-  s.add_development_dependency "rake"
+  s.add_development_dependency "rake", "~> 0.9"
   s.add_development_dependency "rcov"
 
   s.files         = `git ls-files`.split("\n")

data/spec/mocks_enabled_spec.rb

@@ -7,6 +7,7 @@ describe Regrit::RemoteRepo do
   before { @uri = 'git://example.com/does/not/work.git' }
 
   context "(public)" do
+
     # This uri would not work if we weren't mocked
     subject { described_class.new(@uri) }
 
@@ -27,8 +28,6 @@ describe Regrit::RemoteRepo do
       it { should_not be_accessible }
 
       it "should raise TimeoutError" do
-        subject { described_class.new(@uri) }
-
         lambda { subject.refs }.should raise_error(Regrit::TimeoutError)
       end
     end
@@ -37,14 +36,21 @@ describe Regrit::RemoteRepo do
 
   context "(private)" do
     # This uri would not work if we weren't mocked
+    before { @uri = 'git@github.com:engineyard/regrit.git' }
 
     context "(mocked accessible)" do
       before { Regrit::Provider::Mock.accessible = true }
 
+      it "would raise if I used it, but can still be requested about auth" do
+        described_class.new(@uri).should be_private_key_required
+      end
+
+      it "still raises on no key" do
+        lambda { described_class.new(@uri).refs }.should raise_error(Regrit::PrivateKeyRequired)
+      end
+
       it "still raises on bad key" do
-        pending("should we care if the key is blank in mock mode?") do
-          lambda { described_class.new(@uri, :private_key => '') }.should raise_error
-        end
+        lambda { described_class.new(@uri, :private_key => '').refs }.should raise_error(Regrit::PrivateKeyRequired)
       end
 
       context "with a key" do
@@ -56,10 +62,13 @@ describe Regrit::RemoteRepo do
     context "(mocked inaccessible)" do
       before { Regrit::Provider::Mock.accessible = false }
 
+      it "would raise if I used it, but can still be requested about auth" do
+        described_class.new(@uri).should be_private_key_required
+      end
+
       it "still raises on bad key" do
-        pending("should we care if the key is blank in mock mode?") do
-          lambda { described_class.new(@uri, :private_key => '') }.should raise_error
-        end
+        lambda { described_class.new(@uri).refs }.should raise_error(Regrit::PrivateKeyRequired)
+        lambda { described_class.new(@uri, :private_key => '').refs }.should raise_error(Regrit::PrivateKeyRequired)
       end
 
       context "with a key" do

data/spec/remote_repo_spec.rb

@@ -89,12 +89,16 @@ describe Regrit::RemoteRepo do
         end
       end
 
+      it "would raise if I used it, but can still be requested about auth" do
+        described_class.new(@uri).should be_private_key_required
+      end
+
       it "raises on initialization without a key" do
-        lambda { described_class.new(@uri) }.should raise_error(Regrit::PrivateKeyRequired)
+        lambda { described_class.new(@uri).refs }.should raise_error(Regrit::PrivateKeyRequired)
       end
 
       it "raises on initialization with an empty key" do
-        lambda { described_class.new(@uri, :private_key => '') }.should raise_error(Regrit::PrivateKeyRequired)
+        lambda { described_class.new(@uri, :private_key => '').refs }.should raise_error(Regrit::PrivateKeyRequired)
       end
 
       context "with wrong key" do

metadata

@@ -1,150 +1,111 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: regrit
-version: !ruby/object:Gem::Version 
-  hash: 19
+version: !ruby/object:Gem::Version
+  version: 0.1.0
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 6
-  version: 0.0.6
 platform: ruby
-authors: 
+authors:
 - Martin Emde
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-02-22 00:00:00 -08:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-02-22 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: gitable
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70278541044920 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 0
-        - 2
-        - 1
+      - !ruby/object:Gem::Version
         version: 0.2.1
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: open4
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70278541044920
+- !ruby/object:Gem::Dependency
+  name: open4
+  requirement: &70278541044500 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: escape
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70278541044500
+- !ruby/object:Gem::Dependency
+  name: escape
+  requirement: &70278541044040 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: git-ssh-wrapper
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70278541044040
+- !ruby/object:Gem::Dependency
+  name: git-ssh-wrapper
+  requirement: &70278541043540 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 0
-        - 0
-        - 1
-        version: 0.0.1
+      - !ruby/object:Gem::Version
+        version: 0.1.0
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: SystemTimer
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70278541043540
+- !ruby/object:Gem::Dependency
+  name: system-timer19
+  requirement: &70278541043040 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.2
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70278541043040
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70278541042560 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 0
-        version: "2.0"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *70278541042560
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70278541042100 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: rcov
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *70278541042100
+- !ruby/object:Gem::Dependency
+  name: rcov
+  requirement: &70278541041720 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id008
+  prerelease: false
+  version_requirements: *70278541041720
 description: Deal with remote git repositories, yo.
-email: 
+email:
 - martin.emde@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - README.md
@@ -165,41 +126,37 @@ files:
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/wrong_key
-has_rdoc: true
 homepage: http://github.org/martinemde/regrit
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 677623455143979724
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: 677623455143979724
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.5.0
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Never regrit how you talk with remote git repositories
-test_files: 
+test_files:
 - spec/id_rsa
 - spec/id_rsa.pub
 - spec/mocks_enabled_spec.rb