andys-mason 0.1.0 → 0.1.0.1

data/lib/mason/buildpack.rb

@@ -31,7 +31,7 @@ class Mason::Buildpack
     puts "  caching in #{cache_dir}"
     compile_dir = Dir.mktmpdir
     FileUtils.rm_rf compile_dir
-    FileUtils.cp_r app, compile_dir, :preserve => true
+    Mason.cp_R app, compile_dir, :preserve => true
     FileUtils.mkdir_p cache_dir
     Dir.chdir(compile_dir) do
       IO.popen(%{ #{script("compile")} "#{compile_dir}" "#{cache_dir}" }) do |io|

data/lib/mason/cli.rb

@@ -63,11 +63,11 @@ class Mason::CLI < Thor
       FileUtils.rm_rf compile_dir
       FileUtils.rm_rf mason_dir
 
-      FileUtils.cp_r(File.expand_path("~/.mason/buildpacks"), buildpacks_dir,
+      Mason.cp_R(File.expand_path("~/.mason/buildpacks"), buildpacks_dir,
                      :preserve => true)
-      FileUtils.cp_r(File.expand_path("../../../", __FILE__), mason_dir,
+      Mason.cp_R(File.expand_path("../../../", __FILE__), mason_dir,
                      :preserve => true)
-      FileUtils.cp_r(app, compile_dir, :preserve => true)
+      Mason.cp_R(app, compile_dir, :preserve => true)
 
       mason_args =  %{ /share/app -q -o /share/output -t #{type} }
       mason_args += %{ -b "#{options[:buildpack]}" } if options[:buildpack]
@@ -78,7 +78,7 @@ class Mason::CLI < Thor
       COMMAND
 
       FileUtils.rm_rf output
-      FileUtils.cp_r(File.expand_path("~/.mason/share/#{stack}/output"), output,
+      Mason.cp_R(File.expand_path("~/.mason/share/#{stack}/output"), output,
                      :preserve => true)
 
       puts "* packaging"
@@ -109,7 +109,7 @@ class Mason::CLI < Thor
         raise "img not supported yet"
       when :dir then
         FileUtils.rm_rf output
-        FileUtils.cp_r compile_dir, output, :preserve => true
+        Mason.cp_R compile_dir, output, :preserve => true
       else
         raise "no such output type: #{type}"
       end

data/lib/mason.rb

@@ -2,4 +2,11 @@ module Mason
 
   class CommandFailed < StandardError; end
 
+  # A replacement for FileUtils.cp_r that doesn't barf on symlinks to places that don't exist
+  def self.cp_R(src, dest, options = {})
+    return if options[:noop] 
+    output = `cp -vR#{options[:preserve] ? 'p' : ''}#{options[:remove_destination] ? ' --remove-destination' : ''} #{[src,dest].flatten.join ' '}`
+    raise "cp failed: #{output}" unless $?.exitstatus.zero?
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: andys-mason
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -59,7 +59,6 @@ files:
 - lib/mason/cli.rb
 - lib/mason/stacks.rb
 - lib/mason/version.rb
-- lib/mason/cp_r.rb
 homepage: http://github.com/andys/mason
 licenses: []
 post_install_message: 

data/lib/mason/cp_r.rb

@@ -1,7 +0,0 @@
-module Mason
-  def self.cp_R(src, dest, options = {})
-    return if options[:noop] 
-    output = `cp -vR#{options[:preserve] ? 'p' : ''}#{options[:remove_destination] ? ' --remove-destination' : ''} #{[src,dest].flatten.join ' '}`
-    raise "cp failed: #{output}" unless $?.exitstatus.zero?
-  end
-end