code_cache 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b35ba34266cc6f725541d547606b0bda66347ff
-  data.tar.gz: 7b9e153b63507075879e93025035381296f86a55
+  metadata.gz: cf939dd1b7522417b33a50aefe64cc8e50f5fd7a
+  data.tar.gz: ced2daf270974cd3f988d829abd271e6ebe4af6e
 SHA512:
-  metadata.gz: a0f4c2d7416cd4c446c3662cd307d3a712ea9957a505ad200b04f23f7e05416fa631f23ce48e483607749231fa03d7f0f4f86517a51adc3b6aa1f0e0d8db9e1f
-  data.tar.gz: fef3d5e9b7294679c4ef00497dcb4c83167968872a5f180821a8226b2adfd00d15b4cd9cdd5d7577af6f861d3c5655f1c425b9880b4f3c6de262d233dd0f240e
+  metadata.gz: af3dd36dc40e347b417e1730dfa6898b96f6d92947395e94c640f6e79f7301171be0a57524c79d6d46640bd9447ae2bab57b424aba9591285c2a61d6876f4869
+  data.tar.gz: c2e5151d8ebece993df6247468abd028801c73cb0ff65ebb2fa7388428ec469ba195e978320931a705f2e6aeee8c95eaff8e795570dcfea62c82b337992758c5

data/README.md

@@ -5,7 +5,8 @@ Version control checkout abstraction and cache.
 
     repo =  CodeCache.repo( repo_url )
     begin
-      repo.checkout( :head, 'path/to/checkout' )
+      repo.checkout( :head, 'path/to/checkout' )  # checkout master
+      repo.checkout( :head, 'path/to/checkout', 'branch_name' )  # checkout specific branch
     rescue => e
       puts "Checkout failed"
     end

data/lib/code_cache.rb

@@ -11,11 +11,11 @@ module CodeCache
     end
   end
   
-  def self.repo(url)
+  def self.repo(url, options = {})
     if self.identify(url) == :git
-      Repo::Git.new(url)
+      Repo::Git.new(url, options)
     else
-      Repo::SVN.new(url)
+      Repo::SVN.new(url, options)
     end
   end
 

data/lib/code_cache/repo.rb

@@ -1,13 +1,16 @@
 require 'fileutils'
+require 'rbconfig'
+require 'tmpdir'
 
 module CodeCache
 
   class Repo
-    
+
     attr_accessor :url, :cache
-    
+
     def initialize(url, options = {})
-      @cache = options[:cache] || '/tmp/code_cache'
+      cache_dir = Dir.tmpdir() if RbConfig::CONFIG['host_os'].include? "ming" 
+      @cache = options[:cache] || cache_dir || '/tmp/code_cache'
       @url = url
       
       check_repo(url)
@@ -52,5 +55,8 @@ module CodeCache
   
   class CopyError < StandardError
   end
+ 
+  class BranchNotFound < StandardError
+  end
 
 end

data/lib/code_cache/repo/git.rb

@@ -10,7 +10,7 @@ module CodeCache
     # Split the url into a unique array for the cache path
     def split_url
       match = /(?:(?:git|ssh)@(.*):|(?:https?:\/\/(.*?)\/))(.*).git/.match(url)
-      match.captures.compact
+      match.captures.compact if match
     end
 
     # Check access to the repo in question
@@ -23,11 +23,10 @@ module CodeCache
     
     # Checkout a particular revision from the repo into the destination
     # Caches the checkout in the process
-    def checkout( revision, destination )
+    def checkout( revision, destination , branch=nil)
       
-      if revision != :head
-        raise "Checking out anything other than the head of the default branch not supported"
-      end
+      raise "Checking out anything other than the head of the default branch not supported" if revision != :head
+      raise "Not checking out, as #{destination} directory has another git repository" if !Dir["#{destination}/.git"].empty?
       
       cache_destination = location_in_cache()
       
@@ -36,9 +35,8 @@ module CodeCache
       
       puts "Cache: #{cache_destination}"
       puts "Destination: #{destination}"
-      
-      checkout_from_cache_to_destination(cache_destination, destination, revision)
-      
+      output = checkout_from_cache_to_destination(cache_destination, destination, revision, branch)
+
       true
     end
     
@@ -63,11 +61,18 @@ module CodeCache
       { :output => output, :status => status }
     end
     
-    def checkout_from_cache_to_destination(cache_destination, destination, revision)
-      output = `git clone --single-branch #{cache_destination} #{destination} 2>&1`
+    def checkout_from_cache_to_destination(cache_destination, destination, revision, branch)
+      if branch
+        output = `git clone --single-branch #{cache_destination} #{destination} -b #{branch} 2>&1`
+      else
+        output = `git clone --single-branch #{cache_destination} #{destination} 2>&1`
+      end
       status = $? == 0
+
+      raise CodeCache::BranchNotFound if output.include? 'Could not find remote branch'
+
       { :output => output, :status => status }
     end
     
   end
-end
+end

metadata

@@ -1,29 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: code_cache
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - David Buckhurst
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-14 00:00:00.000000000 Z
+date: 2016-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.3'
+- !ruby/object:Gem::Dependency
+  name: mixlib-shellout
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.2.7
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.2.7
 description: Provides a simple api for checking out svn and git repositories. Caches
   checkouts locally so that subsequent checkouts are optimised.
 email: david.buckhurst@bbc.co.uk
@@ -31,11 +45,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- README.md
 - lib/code_cache.rb
 - lib/code_cache/repo.rb
 - lib/code_cache/repo/git.rb
 - lib/code_cache/repo/svn.rb
+- README.md
 homepage: https://github.com/bbc/code_cache
 licenses:
 - MIT
@@ -46,17 +60,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Abstracts & caches svn & git operations