maid 0.6.0.alpha.5 → 0.6.0.alpha.6

data/AUTHORS.md

@@ -5,6 +5,7 @@ In alphabetical order:
 * Graham Siener (@gsiener)
 * Jayson Rhynas (@jayrhynas)
 * John Colvin (@JohnColvin)
+* Jurriaan Pruis (@jurriaan)
 * Justin Hileman (@bobthecow)
 * Larry Lv (@larrylv)
 * Lewis O'Driscoll (@loddy1234)
@@ -12,6 +13,7 @@ In alphabetical order:
 * Mark Jaquith (@markjaquith)
 * Mikael Hultgren (@blomma)
 * Mu Ye (@yemutex)
+* Nico Ritschel (@nicosuave)
 * Pedro Lambert (@p-lambert)
 * Shiro Hazuki (@HazukiShiro)
 * Vladimir Agafonkin (@mourner)

data/ChangeLog

@@ -5,6 +5,7 @@ maid (0.6.0) unstable; urgency=low
   * Pedro Lambert: Add support for Rake tasks defined by Maid (Closes: #68, #123)
   * Jurriaan Pruis: Add daemon mode and repeat support (Closes: #126, #131)
   * Jurriaan Pruis: Add "ignore" option support for "watch" (Closes: #132)
+  * Nico Ritschel: Add "copy" tool (Closes: #72, #133)
 
  -- Benjamin Oakes <hello@benjaminoakes.com>  TODO
 

data/lib/maid/tools.rb

@@ -643,6 +643,35 @@ module Maid::Tools
     Array(paths).select { |p| !(filter_types & content_types(p)).empty? }
   end
 
+  # Copy from `sources` to `destination`
+  #
+  # The path is not copied if a file already exists at the destination with the same name.  A warning is logged instead.
+  # Note: Similar functionality is provided by the sync tool, but this requires installation of the `rsync` binary
+  # ## Examples
+  #
+  # Single path:
+  #
+  #     copy('~/Downloads/foo.zip', '~/Archive/Software/Mac OS X/')
+  # 
+  # Multiple paths:
+  #
+  #     copy(['~/Downloads/foo.zip', '~/Downloads/bar.zip'], '~/Archive/Software/Mac OS X/')
+  #     copy(dir('~/Downloads/*.zip'), '~/Archive/Software/Mac OS X/')    
+  def copy(sources, destination, options = {})
+    destination = expand(destination)
+
+    expand_all(sources).each do |source|
+        target = File.join(destination, File.basename(source))
+
+      unless File.exist?(target)
+        log("cp #{ source.inspect } #{ destination.inspect }")
+        FileUtils.cp(source, destination )
+      else
+        warn("skipping #{ source.inspect } because #{ target.inspect } already exists")
+      end
+    end
+  end
+
   private
 
   def firefox_downloading?(path)

data/lib/maid/version.rb

@@ -1,3 +1,3 @@
 module Maid
-  VERSION = '0.6.0.alpha.5'
+  VERSION = '0.6.0.alpha.6'
 end

data/spec/lib/maid/tools_spec.rb

@@ -545,6 +545,43 @@ module Maid
         @maid.sync(@src_dir, @dst_dir)
       end
     end
+
+    describe '#copy' do
+      before do
+        @src_file = (@src_dir = '~/Source/') + (@file_name = 'foo.zip')
+        FileUtils.mkdir_p(@src_dir)
+        FileUtils.touch(@src_file)
+        FileUtils.mkdir_p(@dst_dir = '~/Destination/')
+      end
+
+      it 'should move expanded paths, passing file_options' do
+        @maid.copy(@src_file, @dst_dir)
+        File.exists?(@dst_dir + @file_name).should be_true
+      end
+
+      it 'should log the move' do
+        @logger.should_receive(:info)
+        @maid.copy(@src_file, @dst_dir)
+      end
+
+      it 'should not move if the target already exists' do
+        FileUtils.touch(@dst_dir + @file_name)
+        @logger.should_receive(:warn)
+
+        @maid.copy(@src_file, @dst_dir)
+      end
+
+      it 'should handle multiple from paths' do
+        second_src_file = @src_dir + (second_file_name = 'bar.zip')
+        FileUtils.touch(second_src_file)
+        src_files = [@src_file, second_src_file]
+
+        @maid.copy(src_files, @dst_dir)
+        p "Source files: #{src_files}, dst_dir: #{@dst_dir}"
+        File.exist?(@dst_dir + @file_name).should be_true
+        File.exist?(@dst_dir + second_file_name).should be_true
+      end
+    end
   end
 
   describe Tools, :fakefs => false do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: maid
 version: !ruby/object:Gem::Version
-  version: 0.6.0.alpha.5
+  version: 0.6.0.alpha.6
   prerelease: 6
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2014-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: escape
-  requirement: &9484660 !ruby/object:Gem::Requirement
+  requirement: &7178700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,10 @@ dependencies:
         version: 0.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *9484660
+  version_requirements: *7178700
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &9480520 !ruby/object:Gem::Requirement
+  requirement: &7174560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -38,10 +38,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *9480520
+  version_requirements: *7174560
 - !ruby/object:Gem::Dependency
   name: deprecated
-  requirement: &9456100 !ruby/object:Gem::Requirement
+  requirement: &7150080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -49,10 +49,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *9456100
+  version_requirements: *7150080
 - !ruby/object:Gem::Dependency
   name: mime-types
-  requirement: &9455100 !ruby/object:Gem::Requirement
+  requirement: &7149140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -60,10 +60,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *9455100
+  version_requirements: *7149140
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &9454180 !ruby/object:Gem::Requirement
+  requirement: &7148160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -71,10 +71,10 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *9454180
+  version_requirements: *7148160
 - !ruby/object:Gem::Dependency
   name: xdg
-  requirement: &9453500 !ruby/object:Gem::Requirement
+  requirement: &7147500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -82,10 +82,10 @@ dependencies:
         version: 2.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *9453500
+  version_requirements: *7147500
 - !ruby/object:Gem::Dependency
   name: listen
-  requirement: &9452900 !ruby/object:Gem::Requirement
+  requirement: &7146880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -93,10 +93,10 @@ dependencies:
         version: 2.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *9452900
+  version_requirements: *7146880
 - !ruby/object:Gem::Dependency
   name: rufus-scheduler
-  requirement: &9452200 !ruby/object:Gem::Requirement
+  requirement: &7146200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -104,10 +104,10 @@ dependencies:
         version: 3.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *9452200
+  version_requirements: *7146200
 - !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &9451640 !ruby/object:Gem::Requirement
+  requirement: &7145620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -115,10 +115,10 @@ dependencies:
         version: 0.4.2
   type: :development
   prerelease: false
-  version_requirements: *9451640
+  version_requirements: *7145620
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &9451060 !ruby/object:Gem::Requirement
+  requirement: &7145080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -126,10 +126,10 @@ dependencies:
         version: 2.10.4
   type: :development
   prerelease: false
-  version_requirements: *9451060
+  version_requirements: *7145080
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &9450300 !ruby/object:Gem::Requirement
+  requirement: &7144320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -137,10 +137,10 @@ dependencies:
         version: 4.5.0
   type: :development
   prerelease: false
-  version_requirements: *9450300
+  version_requirements: *7144320
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &9449720 !ruby/object:Gem::Requirement
+  requirement: &7143720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -148,10 +148,10 @@ dependencies:
         version: 10.4.2
   type: :development
   prerelease: false
-  version_requirements: *9449720
+  version_requirements: *7143720
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &9449100 !ruby/object:Gem::Requirement
+  requirement: &7143080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -159,10 +159,10 @@ dependencies:
         version: 3.2.2
   type: :development
   prerelease: false
-  version_requirements: *9449100
+  version_requirements: *7143080
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &9448460 !ruby/object:Gem::Requirement
+  requirement: &7142480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -170,10 +170,10 @@ dependencies:
         version: 3.1.0
   type: :development
   prerelease: false
-  version_requirements: *9448460
+  version_requirements: *7142480
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &9404220 !ruby/object:Gem::Requirement
+  requirement: &7098200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -181,10 +181,10 @@ dependencies:
         version: 0.7.0
   type: :development
   prerelease: false
-  version_requirements: *9404220
+  version_requirements: *7098200
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &9403340 !ruby/object:Gem::Requirement
+  requirement: &7097280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -192,10 +192,10 @@ dependencies:
         version: 0.8.4
   type: :development
   prerelease: false
-  version_requirements: *9403340
+  version_requirements: *7097280
 - !ruby/object:Gem::Dependency
   name: rb-inotify
-  requirement: &9402600 !ruby/object:Gem::Requirement
+  requirement: &7096540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -203,10 +203,10 @@ dependencies:
         version: 0.9.0
   type: :development
   prerelease: false
-  version_requirements: *9402600
+  version_requirements: *7096540
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &9401380 !ruby/object:Gem::Requirement
+  requirement: &7095320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -214,7 +214,7 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *9401380
+  version_requirements: *7095320
 description: ! 'Be lazy: let Maid clean up after you. Think of it as "Hazel for hackers".'
 email:
 - hello@benjaminoakes.com