borrower 0.1.0 → 0.1.1

data/lib/borrower/manifest.rb

@@ -7,21 +7,32 @@ module Borrower
     end
 
     def find file
-      path = @_manifest.files.fetch(file) { false }
-      return path if path
+      return file if Path.remote?(file) || Path.exists?(file)
 
-      matches = []
-      @_manifest.directories.each do |dir|
-        Dir[File.join( dir, '*' )].each do |possibility|
-          matches << possibility if possibility.match( file )
-        end
-      end
+      path = check_for_file_in_manifest_files(file) || false
+      return path if path
 
-      path = matches.sort { |a,b| a.length <=> b.length }.first
+      path = check_for_file_in_manifest_directories(file) || false
       return path if path
 
       raise "Could not file #{file}"
     end
+
+    private
+
+      def check_for_file_in_manifest_files file
+        @_manifest.files.fetch(file) { false }
+      end
+
+      def check_for_file_in_manifest_directories file
+        matches = []
+        @_manifest.directories.each do |dir|
+          Dir[File.join( dir, '*' )].each do |possibility|
+            matches << possibility if possibility.match( file )
+          end
+        end
+        path = matches.sort { |a,b| a.length <=> b.length }.first
+      end
   end
 
   class Manifest

data/lib/borrower/merge.rb

@@ -28,7 +28,7 @@ module Borrower
       end
 
       def contents_from_file path
-        ::Borrower::Path.contents(::Borrower.find(path))
+        ::Borrower::Path.contents(path)
       end
 
   end

data/lib/borrower/path.rb

@@ -6,15 +6,15 @@ module Borrower
       # @param path [String]
       # @return [String] the contents
       def contents path
-        if exists? path
-          if remote? path
-            fetch_from_remote(path).body
-          else
-            return IO.read(path)
-          end
+        path = Borrower.find(path)
+
+        if remote?(path) && exists?(path)
+          return fetch_from_remote(path).body
         else
-          raise "nothing exists at the provided path '#{path}'"
+          return IO.read(path)
         end
+
+        raise "nothing exists at the provided path '#{path}'"
       end
 
       # check if the file exists for borrowing

data/lib/borrower/version.rb

@@ -1,3 +1,3 @@
 module Borrower
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/borrower/manifest_spec.rb

@@ -6,6 +6,7 @@ describe Borrower::Manifest do
     given_files [ "baz.txt", "files/baz.txt", "files/woo.txt", "files/foo.txt" ]
     Borrower.manifest do |m|
       m.file "me", File.join( TMP, "test.txt" )
+      m.file "remote", "https://gist.github.com/stevenosloan/5578606/raw/97ab1305184bdeac33472f9f1fcc1c9e278a1bb3/dummy.txt"
       m.dir File.join( TMP )
       m.dir File.join( TMP, 'files' )
     end
@@ -19,6 +20,14 @@ describe Borrower::Manifest do
     Borrower.find("me").should == File.join( TMP, "test.txt" )
   end
 
+  it "returns remote paths if given fully resolved" do
+    Borrower.find("http://google.com").should == "http://google.com"
+  end
+
+  it "finds named remote files" do
+    Borrower.find("remote").should == "https://gist.github.com/stevenosloan/5578606/raw/97ab1305184bdeac33472f9f1fcc1c9e278a1bb3/dummy.txt"
+  end
+
   it "creates list of files from directories" do
     Borrower.find("baz.txt").should == File.join( TMP, "baz.txt" )
     Borrower.find("files/baz.txt").should == File.join( TMP, "files/baz.txt" )

data/spec/borrower_spec.rb

@@ -26,6 +26,18 @@ describe Borrower do
     Borrower::Transport.take( file_destination ).should == "Hello I'm a file"
   end
 
+  it "borrows named local and remote files" do
+    Borrower.manifest do |m|
+      m.file "local", local_file
+      m.file "remote", remote_file
+    end
+    borrow "local", to: file_destination
+    borrow "remote", to: File.join( TMP, "remote.txt" )
+
+    Borrower::Transport.take( file_destination ).should == "Hi I'm a file"
+    Borrower::Transport.take( File.join( TMP, "remote.txt" ) ).should == "Hello I'm a file"
+  end
+
   it "merges files if merge is set to true" do
     borrow merge_file, to: file_destination, merge: true
     Borrower::Transport.take( file_destination ).should == "Hi I'm a file"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: borrower
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors: