borrower 0.2.1 → 0.3.0

data/lib/borrower/content.rb

@@ -0,0 +1,90 @@
+module Borrower
+  class Content
+    class << self
+
+      # take the contents of the file at the path
+      # @param [String] path
+      # @return [String] the contents
+      def get path
+        path  = Borrower.find(path)
+        obj = Item.new( path )
+
+        if obj.remote? && obj.exists?
+          return obj.body
+        else
+          return IO.read(path)
+        end
+
+        raise "nothing exists at the provided path '#{path}'"
+      end
+
+      def put content, destination, args
+        FileUtils.mkdir_p( File.dirname(destination) )
+        File.open( destination, 'w', internal_encoding: content.encoding ) do |file|
+          content = Borrower.merge(content) if args[0].fetch(:merge) { false }
+          file.write content
+        end
+      end
+
+    end
+
+    class Item
+      def initialize path
+        @path = path
+      end
+
+      def remote?
+        @_remote ||= is_remote?
+      end
+
+      def exists?
+        if remote?
+          return ( fetch_from_remote(@path).msg.include? "OK" )
+        else
+          return File.exists? @path
+        end
+      end
+
+      def body
+        @_response.body
+      end
+
+      private
+
+        def is_remote?
+          if @path.match /http[s]?:\/\//
+            return true
+          end
+          return false
+        end
+
+        def fetch_from_remote path, limit=10
+          return @_response unless @_response.nil?
+
+          raise Error, 'HTTP redirect too deep' if limit == 0
+          response = get_response(path)
+
+          case response
+          when Net::HTTPSuccess then @_response = response
+          when Net::HTTPRedirection then fetch_from_remote(response['location'], limit-1 )
+          else
+            @_response = response
+          end
+        end
+
+        def get_response path
+          uri = URI.parse(path)
+          request = Net::HTTP.new(uri.host, uri.port)
+
+          if uri.scheme == "https"
+            request.use_ssl = true
+            request.verify_mode = OpenSSL::SSL::VERIFY_NONE
+            request.ssl_version = :SSLv3
+          end
+
+          return request.get(uri.request_uri)
+        end
+
+    end
+  end
+end

data/lib/borrower/manifest.rb

@@ -18,7 +18,8 @@ module Borrower
     end
 
     def find file
-      return file if Path.remote?(file) || Path.exists?(file)
+      obj = Content::Item.new(file)
+      return file if obj.remote? || obj.exists?
 
       path = check_for_file_in_manifest_files(file) || false
       return path if path

data/lib/borrower/merge.rb

@@ -23,7 +23,7 @@ module Borrower
       end
 
       def contents_from_file path
-        Path.contents(path)
+        Content.get(path)
       end
 
   end

data/lib/borrower/public_api.rb

@@ -8,7 +8,7 @@ module Borrower
     # @param [String] from the path to the file
     # @return [String] contents of the file
     def take from
-      Transport.take from
+      Borrower::Content.get from
     end
 
     # write the content to a destination file
@@ -16,8 +16,8 @@ module Borrower
     # @param [String] content content for the file
     # @param [String] to path to write contents to
     # @return [Void]
-    def put content, to
-      Transport.put content, to
+    def put content, to, *args
+      Borrower::Content.put content, to, args
     end
 
     # parse through the content and merge

data/lib/borrower/version.rb

@@ -1,3 +1,3 @@
 module Borrower
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/lib/borrower.rb

@@ -6,10 +6,9 @@ require "uri"
 
 # borrower
 require 'borrower/version'
+require 'borrower/content'
 require 'borrower/manifest'
 require 'borrower/merge'
-require 'borrower/path'
-require 'borrower/transport'
 require 'borrower/public_api'
 
 module Borrower::DSL
@@ -31,7 +30,7 @@ module Borrower::DSL
   # @return [Void]
   def borrow path, args
     destination = args.delete(:to) { raise ArgumentError, "missing 'to:' argument" }
-    Borrower::Transport.move path, destination, args
+    Borrower.put Borrower.take(path), destination , args
   end
 
 end

data/spec/borrower/merge_spec.rb

@@ -34,7 +34,7 @@ describe "moving files with a merge" do
       m.file 'woo.txt', File.join( TMP, 'woo.txt' )
     end
 
-    Borrower.merge(Borrower::Transport.take(Borrower.find("multiple.txt"))).should == <<-output
+    Borrower.merge( Borrower.take(Borrower.find("multiple.txt"))).should == <<-output
       hello I'm merged text
       woo
 

data/spec/borrower/transport_spec.rb

@@ -1,48 +1,48 @@
-require 'spec_helper'
-require 'borrower/transport'
+# require 'spec_helper'
+# require 'borrower/transport'
 
-describe Borrower::Transport do
-  include Borrower::Transport
+# describe Borrower::Transport do
+#   include Borrower::Transport
 
-  before :each do
-    given_file "file.txt", "Hi I'm a file"
-  end
+#   before :each do
+#     given_file "file.txt", "Hi I'm a file"
+#   end
 
-  after :each do
-    cleanup_tmp
-  end
+#   after :each do
+#     cleanup_tmp
+#   end
 
-  let (:local_file)       { File.join( TMP, 'file.txt' ) }
-  let (:destination_path) { File.join( TMP, 'destination/file.txt' ) }
+#   let (:local_file)       { File.join( TMP, 'file.txt' ) }
+#   let (:destination_path) { File.join( TMP, 'destination/file.txt' ) }
 
 
-  describe "#take" do
-    it "returns the correct contents" do
-      take( local_file ).should == "Hi I'm a file"
-    end
-  end
+#   describe "#take" do
+#     it "returns the correct contents" do
+#       take( local_file ).should == "Hi I'm a file"
+#     end
+#   end
 
-  describe "#put" do
+#   describe "#put" do
 
-    it "puts a string to a file" do
-      put "hello", destination_path
-      take( destination_path ).should == "hello"
-    end
-  end
+#     it "puts a string to a file" do
+#       put "hello", destination_path
+#       take( destination_path ).should == "hello"
+#     end
+#   end
 
-  describe "#move" do
+#   describe "#move" do
 
-    it "moves the file" do
-      move( local_file, destination_path )
-      take( destination_path ).should == "Hi I'm a file"
-    end
+#     it "moves the file" do
+#       move( local_file, destination_path )
+#       take( destination_path ).should == "Hi I'm a file"
+#     end
 
-    it "overwrites an existing file" do
-      put "hello", destination_path
-      take( destination_path ).should == "hello" # just to make sure it was written to begin with
-      move( local_file, destination_path )
-      take( destination_path ).should == "Hi I'm a file"
-    end
-  end
+#     it "overwrites an existing file" do
+#       put "hello", destination_path
+#       take( destination_path ).should == "hello" # just to make sure it was written to begin with
+#       move( local_file, destination_path )
+#       take( destination_path ).should == "Hi I'm a file"
+#     end
+#   end
 
-end
+# end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: borrower
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-17 00:00:00.000000000 Z
+date: 2013-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -35,11 +35,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/borrower/content.rb
 - lib/borrower/manifest.rb
 - lib/borrower/merge.rb
-- lib/borrower/path.rb
 - lib/borrower/public_api.rb
-- lib/borrower/transport.rb
 - lib/borrower/version.rb
 - lib/borrower.rb
 - spec/borrower/manifest_spec.rb

data/lib/borrower/path.rb

@@ -1,79 +0,0 @@
-module Borrower
-  module Path
-    class << self
-
-      # take the contents of the file at the path
-      # @param path [String]
-      # @return [String] the contents
-      def contents path
-        path = Borrower.find(path)
-
-        if remote?(path) && exists?(path)
-          return fetch_from_remote(path).body
-        else
-          return IO.read(path)
-        end
-
-        raise "nothing exists at the provided path '#{path}'"
-      end
-
-      # check if the file exists for borrowing
-      # @param path [String]
-      # @return [Boolean]
-      def exists? path
-        if remote? path
-          return ( fetch_from_remote(path).msg.include? "OK" )
-        else
-          return File.exists? path
-        end
-      end
-
-      # check if the path is remote or local
-      # @param path [String]
-      # @return [Boolean]
-      def remote? path
-        pattern = /http[s]?:\/\//
-        if path.match(pattern)
-          return true
-        end
-
-        return false
-      end
-
-      # get the contents of a remote file, handling redirection
-      # and ssh protocols
-      # @param path [String]
-      # @param limit [Integer] (optional)
-      # @return [String]
-      def fetch_from_remote path, limit=10
-        raise Error, 'HTTP redirect too deep' if limit == 0
-        response = get_response(path)
-
-        case response
-        when Net::HTTPSuccess then response
-        when Net::HTTPRedirection then fetch_from_remote(response['location'], limit-1 )
-        else
-          response
-        end
-      end
-
-      # build a Net::HTTP request object and
-      # returns the response
-      # @param path[String]
-      # @return [Net::HTTPResponse]
-      def get_response path
-        uri = URI.parse(path)
-        request = Net::HTTP.new(uri.host, uri.port)
-
-        if uri.scheme == "https"
-          request.use_ssl = true
-          request.verify_mode = OpenSSL::SSL::VERIFY_NONE
-          request.ssl_version = :SSLv3
-        end
-
-        return request.get(uri.request_uri)
-      end
-
-    end
-  end
-end

data/lib/borrower/transport.rb

@@ -1,35 +0,0 @@
-module Borrower
-  module Transport
-
-    # routes a file from -> to
-    # @param [String] from
-    # @param [String] to
-    # @param [Hash] args
-    def move from, to, args={}
-      content = take(from)
-      content = Borrower.merge(content) if args[:merge]
-      put( content, to )
-    end
-
-    # handles taking a file
-    # @param [String] from
-    # @return [String]
-    def take from
-      Path.contents(from)
-    end
-
-    # puts a file somewhere
-    # @param [String] content
-    # @param [String] to
-    def put content, to
-      FileUtils.mkdir_p( File.dirname(to) )
-      File.open( to, 'w', internal_encoding: content.encoding ) do |file|
-        file.write content
-      end
-    end
-
-    module_function :move
-    module_function :take
-    module_function :put
-  end
-end