mason 0.0.11 → 0.0.12

data/README.md

@@ -52,16 +52,16 @@ You will need [VirtualBox](https://www.virtualbox.org/wiki/Downloads) for Vagran
 
 	$ gem install vagrant
 
-	$ vagrant box add cedar http://path/to/cedar.box
+	$ vagrant box add lucid64 http://files.vagrantup.com/lucid64.box
 
-    $ mason stacks:create cedar
-    * creating stack cedar... done
+    $ mason stacks:create lucid64
+    * creating stack lucid64... done
 
-    $ mason stacks:up cedar
-    * booting stack cedar (this may take a while)... done
+    $ mason stacks:up lucid64
+    * booting stack lucid64 (this may take a while)... done
 
-    $ mason:build /tmp/app -t tgz -o /tmp/compiled.tgz -s cedar
-    * booting stack cedar (this may take a while)... done
+    $ mason:build /tmp/app -t tgz -o /tmp/compiled.tgz -s lucid64
+    * booting stack lucid64 (this may take a while)... done
 	* detecting buildpack... done
 	  = name: Baz
 	  = url: https://github.com/ddollar/buildpack-baz.git

data/lib/mason/buildpack.rb

@@ -1,5 +1,7 @@
 require "mason"
 require "tmpdir"
+require "yaml"
+require "foreman/engine"
 
 class Mason::Buildpack
 
@@ -24,31 +26,61 @@ class Mason::Buildpack
     end
   end
 
-  def compile(app)
-    mkchtmpdir do |cache_dir|
-      compile_dir = Dir.mktmpdir
-      FileUtils.rm_rf compile_dir
-      FileUtils.cp_r app, compile_dir
-      Dir.chdir(compile_dir) do
-        IO.popen(%{ #{script("compile")} "#{compile_dir}" "#{cache_dir}" }) do |io|
-          until io.eof?
-            data = io.gets
-            data.gsub!(/^-----> /, "  + ")
-            data.gsub!(/^       /, "      ")
-            data.gsub!(/^\s+\!\s+$/, "")
-            data.gsub!(/^\s+\!\s+/, "  ! ")
-            data.gsub!(/^\s+$/, "")
-            print data
-          end
+  def compile(app, env_file=nil, cache=nil)
+    cache_dir = cache || "#{app}/.git/cache"
+    puts "  caching in #{cache_dir}"
+    compile_dir = Dir.mktmpdir
+    FileUtils.rm_rf compile_dir
+    FileUtils.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|
+        until io.eof?
+          data = io.gets
+          data.gsub!(/^-----> /, "  + ")
+          data.gsub!(/^       /, "      ")
+          data.gsub!(/^\s+\!\s+$/, "")
+          data.gsub!(/^\s+\!\s+/, "  ! ")
+          data.gsub!(/^\s+$/, "")
+          print data
         end
-        raise "compile failed" unless $?.exitstatus.zero?
       end
-      compile_dir
+      raise "compile failed" unless $?.exitstatus.zero?
     end
+    release = YAML.load(`#{script('release')}`)
+    write_env(compile_dir, release, env_file)
+    write_procfile(compile_dir, release)
+    compile_dir
   end
 
 private
 
+  def write_env(compile_dir, release, env_file)
+    env = env_file ? Foreman::Engine.read_environment(env_file) : {}
+    config = release["config_vars"].merge(env)
+
+    File.open(File.join(compile_dir, ".env"), "w") do |f|
+      f.puts config.map{|k, v| "#{k}=#{v}"}.join("\n")
+    end
+  end
+
+  def write_procfile(compile_dir, release)
+    filename = File.join(compile_dir, "Procfile")
+    process_types = release["default_process_types"] || {}
+
+    if File.exists? filename
+      Foreman::Procfile.new(filename).entries.each do |e|
+        process_types[e.name] = e.command
+      end
+    end
+
+    File.open(filename, "w") do |f|
+      process_types.each do |name, command|
+        f.puts "#{name}: #{command}"
+      end
+    end
+  end
+
   def mkchtmpdir
     ret = nil
     Dir.mktmpdir do |dir|
@@ -62,6 +94,5 @@ private
   def script(name)
     File.join(dir, "bin", name)
   end
-
 end
 

data/lib/mason/buildpacks.rb

@@ -2,18 +2,31 @@ require "fileutils"
 require "mason"
 require "mason/buildpack"
 require "uri"
+require "digest/sha1"
 
 class Mason::Buildpacks
 
-  def self.install(url)
-    FileUtils.mkdir_p root
+  def self.install(url, ad_hoc=false)
+    root_dir = ad_hoc ? ad_hoc_root : root
+    FileUtils.mkdir_p root_dir
 
-    Dir.chdir(root) do
-      if URI.parse(url).path =~ /buildpack-(\w+)/
+    Dir.chdir(root_dir) do
+      uri = URI.parse(url)
+      if uri.path =~ /buildpack-(\w+)/
         name = $1
-        raise "#{name} buildpack already installed" if File.exists?(name)
-        system "git clone #{url} #{name} >/dev/null 2>&1"
-        raise "failed to clone buildpack" unless $?.exitstatus.zero?
+        name += "-#{Digest::SHA1.hexdigest(url).to_s[0 .. 8]}" if ad_hoc
+        branch = uri.fragment || "master"
+        if File.exists?(name)
+          # Can't do a fetch here as it won't update local branches
+          system "cd #{name} && git checkout master && git pull"
+          raise "failed to update buildpack checkout" unless $?.exitstatus.zero?
+        else
+          system "git clone #{url.split('#').first} #{name} >/dev/null 2>&1"
+          raise "failed to clone buildpack" unless $?.exitstatus.zero?
+        end
+        system "cd #{name} && git checkout #{branch} 2> /dev/null"
+        raise "failed to check out branch #{branch}" unless $?.exitstatus.zero?
+        File.expand_path(root_dir + "/" + name)
       else
         raise "BUILDPACK should be a url containing buildpack-NAME.git"
       end
@@ -27,11 +40,16 @@ class Mason::Buildpacks
     end
   end
 
-  def self.root(expand=true)
+  def self.root(ad_hoc=false, expand=true)
     dir = "~/.mason/buildpacks"
     expand ? File.expand_path(dir) : dir
   end
 
+  def self.ad_hoc_root(expand=true)
+    dir = "~/.mason/buildpacks-ad-hoc"
+    expand ? File.expand_path(dir) : dir
+  end
+
   def self.buildpacks
     @buildpacks ||= begin
       Dir[File.join(root, "*")].map do |buildpack_dir|
@@ -40,10 +58,16 @@ class Mason::Buildpacks
     end
   end
 
-  def self.detect(app)
-    buildpacks.each do |buildpack|
-      ret = buildpack.detect(app)
-      return [buildpack, ret] if ret
+  def self.detect(app, buildpack_url)
+    if buildpack_url
+      puts "Using $BUILDPACK_URL: #{buildpack_url}"
+      buildpack_dir = install(buildpack_url, true)
+      return Mason::Buildpack.new(buildpack_dir)
+    else
+      buildpacks.each do |buildpack|
+        ret = buildpack.detect(app)
+        return [buildpack, ret] if ret
+      end
     end
     nil
   end

data/lib/mason/cli.rb

@@ -25,6 +25,8 @@ class Mason::CLI < Thor
   method_option :quiet,     :type => :boolean, :aliases => "-q", :desc => "quiet packaging output"
   method_option :stack,     :type => :string, :aliases => "-s", :desc => "use a stack for building"
   method_option :type,      :type => :string, :aliases => "-t", :desc => "output type (dir, img, tgz)"
+  method_option :env_file,  :type => :string, :aliases => "-e", :desc => "config environment file"
+  method_option :cache,     :type => :string, :aliases => "-c", :desc => "cache directory"
 
   def build(app)
     app = File.expand_path(app)
@@ -57,9 +59,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
-      FileUtils.cp_r app, compile_dir
-      FileUtils.cp_r File.expand_path("../../../", __FILE__), mason_dir
+      FileUtils.cp_r(File.expand_path("~/.mason/buildpacks"), buildpacks_dir,
+                     :preserve => true)
+      FileUtils.cp_r(File.expand_path("../../../", __FILE__), mason_dir,
+                     :preserve => true)
+      FileUtils.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]
@@ -70,7 +74,8 @@ class Mason::CLI < Thor
       COMMAND
 
       FileUrils.rm_rf output
-      FileUtils.cp_r File.expand_path("~/.mason/share/#{stack}/output"), output
+      FileUtils.cp_r(File.expand_path("~/.mason/share/#{stack}/output"), output,
+                     :preserve => true)
 
       puts "* packaging"
       puts "  = type: #{type}"
@@ -78,7 +83,8 @@ class Mason::CLI < Thor
     else
       print "* detecting buildpack... "
 
-      buildpack, ret = Mason::Buildpacks.detect(app)
+      buildpack_url = ENV["BUILDPACK_URL"] || options[:buildpack]
+      buildpack, ret = Mason::Buildpacks.detect(app, buildpack_url)
       raise "no valid buildpack detected" unless buildpack
 
       puts "done"
@@ -87,7 +93,7 @@ class Mason::CLI < Thor
       puts "  = display: #{ret}"
 
       puts "* compiling..."
-      compile_dir = buildpack.compile(app)
+      compile_dir = buildpack.compile(app, options[:env_file], options[:cache])
 
       print "* packaging... " unless options[:quiet]
       case type.to_sym
@@ -99,7 +105,7 @@ class Mason::CLI < Thor
         raise "img not supported yet"
       when :dir then
         FileUtils.rm_rf output
-        FileUtils.cp_r compile_dir, output
+        FileUtils.cp_r compile_dir, output, :preserve => true
       else
         raise "no such output type: #{type}"
       end

data/lib/mason/version.rb

@@ -1,3 +1,3 @@
 module Mason
-  VERSION = "0.0.11"
+  VERSION = "0.0.12"
 end

metadata

@@ -1,65 +1,84 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: mason
-version: !ruby/object:Gem::Version
-  version: 0.0.11
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 12
+  version: 0.0.12
 platform: ruby
-authors:
+authors: 
 - David Dollar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-19 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-04-25 00:00:00 -07:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: thor
-  requirement: &70257394090020 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *70257394090020
+  version_requirements: *id001
 description: Build things
 email: ddollar@gmail.com
-executables:
+executables: 
 - mason
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
+- README.md
 - bin/mason
 - data/Vagrantfile.template
-- lib/mason/buildpack.rb
 - lib/mason/buildpacks.rb
+- lib/mason/version.rb
 - lib/mason/cli.rb
+- lib/mason/buildpack.rb
 - lib/mason/stacks.rb
-- lib/mason/version.rb
 - lib/mason.rb
-- README.md
+has_rdoc: true
 homepage: http://github.com/ddollar/mason
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Build things
 test_files: []
+