borrower 0.4.0 → 0.5.0

data/lib/borrower/content.rb

@@ -18,10 +18,9 @@ module Borrower
         raise "nothing exists at the provided path '#{path}'"
       end
 
-      def put content, destination, args
+      def put content, destination
         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

data/lib/borrower/public_api.rb

@@ -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, *args
-      Borrower::Content.put content, to, args
+    def put content, to
+      Borrower::Content.put content, to
     end
 
     # parse through the content and merge

data/lib/borrower/version.rb

@@ -1,3 +1,3 @@
 module Borrower
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/lib/borrower.rb

@@ -29,17 +29,18 @@ module Borrower::DSL
   #   end
   #
   # @param [String] path
-  # @param [Hash] args
-  # @option args [String] :to the destination path
-  # @option args [Boolean] :merge wether to merge or not, defaults to `false`
+  # @param [Hash] options
+  # @option options [String] :to the destination path
+  # @option options [Boolean] :merge wether to merge or not, defaults to `false`
   # @return [Void]
-  def borrow path, args={}, &block
-    destination = args.delete(:to) { raise ArgumentError, "missing 'to:' argument" }
+  def borrow path, options={}, &block
+    destination = options.delete(:to) { raise ArgumentError, "missing 'to:' argument" }
     content = Borrower.take(path)
+    content = Borrower.merge(content) if options.fetch(:merge) { false }
     if block_given?
       content = yield content
     end
-    Borrower.put content, destination, args
+    Borrower.put content, destination
   end
 
 end

data/spec/borrower_spec.rb

@@ -38,6 +38,11 @@ describe Borrower do
     Borrower.take( File.join( TMP, "remote.txt" ) ).should == "Hello I'm a file"
   end
 
+  it "doesn't merge file if merge is not set" do
+    borrow merge_file, to: file_destination
+    Borrower.take( file_destination ).should == "#= borrow '#{File.join( TMP, 'file.txt')}'"
+  end
+
   it "merges files if merge is set to true" do
     borrow merge_file, to: file_destination, merge: true
     Borrower.take( file_destination ).should == "Hi I'm a file"

data/spec/spec_helper.rb

@@ -1,5 +1,4 @@
 require 'rspec'
-require 'borrower'
 require 'fileutils'
 
 TMP = File.join( Dir.pwd, "tmp" )
@@ -29,4 +28,9 @@ end
 
 def cleanup_tmp
   `rm -rf #{TMP}`
-end
+end
+
+require 'coveralls'
+Coveralls.wear!
+
+require 'borrower'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: borrower
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-24 00:00:00.000000000 Z
+date: 2013-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -43,7 +43,6 @@ files:
 - lib/borrower.rb
 - spec/borrower/manifest_spec.rb
 - spec/borrower/merge_spec.rb
-- spec/borrower/transport_spec.rb
 - spec/borrower_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/stevenosloan/borrower
@@ -75,7 +74,6 @@ summary: For borrowing little snippets of the web, or files, or really any snipp
 test_files:
 - spec/borrower/manifest_spec.rb
 - spec/borrower/merge_spec.rb
-- spec/borrower/transport_spec.rb
 - spec/borrower_spec.rb
 - spec/spec_helper.rb
 has_rdoc: 

data/spec/borrower/transport_spec.rb

@@ -1,48 +0,0 @@
-# require 'spec_helper'
-# require 'borrower/transport'
-
-# describe Borrower::Transport do
-#   include Borrower::Transport
-
-#   before :each do
-#     given_file "file.txt", "Hi I'm a file"
-#   end
-
-#   after :each do
-#     cleanup_tmp
-#   end
-
-#   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 "#put" do
-
-#     it "puts a string to a file" do
-#       put "hello", destination_path
-#       take( destination_path ).should == "hello"
-#     end
-#   end
-
-#   describe "#move" do
-
-#     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
-
-# end