embork 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a910ee84b65e01f8d7c3cd0c5fabf62e7867e7d
-  data.tar.gz: 3f044dc257979b39af6f9c8deb0c288a6be4b7c6
+  metadata.gz: d18393fa8f72cada548910072121d0ed13d7fe22
+  data.tar.gz: 08105e21003afa74345ae86a79675d3cb8aa0d91
 SHA512:
-  metadata.gz: 64a3b0bef1ac0f7a433e7d98d2e87b37e89424ae6e40399f47204b8f7b30993235c44d99acf43550da67ddb8202d7be62320016a59331f07b08c13bfebcf7368
-  data.tar.gz: db7ffcb60145e206106ba3dadd7d4d96346492ddb5a3c0cafeae4dd57b158cf686ee600cd2d5412a186d07a3cbda949f9937e7bd35007e57815c694d9708e7fc
+  metadata.gz: 83117aeceb898442de7446e761e23aaaadc04bbc93599ed55ce6d9a26a07da3e5f4414352731d080df8605c87a3c691705ca033ec4da8bd7725366f4a40a9b5f
+  data.tar.gz: 52cda448b0673f535cdd4883e28d55316c655a5bd7cf79c8bb2dfef251c036613e72b5938fd785ccc883f9a51248f3ec222e503d72872fb356bf5e2cb280a019

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 0.0.12
+- By default listen on 0.0.0.0 instead of localhost. 0.0.0.0 listens on all
+  interfaces. Localhost only answers local requests to 127.0.0.1.
+- Take out keyword arguments so that embork can run through rubinius.
+
 # 0.0.11
 - Fix a bug where it was impossible to forward requests between sprockets and a
   dynamic backend in development mode.

data/embork.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'barber', '~> 0.4.2'
   spec.add_runtime_dependency 'colorize'
   spec.add_runtime_dependency 'qunit-runner', '~> 0.0.1'
-  spec.add_runtime_dependency 'phrender', '~> 0.0.4'
+  spec.add_runtime_dependency 'phrender', '~> 0.0.5'
 
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rspec', '~> 3.0.0.beta1'

data/lib/embork/build_versions.rb

@@ -1,21 +1,29 @@
 module Embork::BuildVersions
-  VERSION_FORMAT_EXP = /\d{4}\.\d{2}\.\d{2}\.\d{2}\.\d{2}\.\d{2}\.\d{4}/
+  VERSION_FORMAT_EXP = /[a-f0-9]{40}\.js/
 
   def sorted_versions(project_root)
     build_path = File.join(project_root, 'build', Embork.env.to_s)
 
-    versions = []
+    versioned_files = []
     Find.find(build_path) do |file|
-      version = version_name(file)
-      versions.push version if version
+      versioned_files.push(file) if file.match VERSION_FORMAT_EXP
     end
 
+    sorted_files = versioned_files.sort_by do |file|
+      File.mtime file
+    end
+
+    versions = sorted_files.map { |f| version_name f }
+
     # Tidy up!
-    versions.uniq!.sort!.reverse!
+    versions.uniq.reverse
   end
 
   def version_name(filename)
-    m = File.basename(filename).match VERSION_FORMAT_EXP
-    m.nil? ? false : m[0]
+    if match = filename.match(VERSION_FORMAT_EXP)
+      match[0]
+    else
+      nil
+    end
   end
 end

data/lib/embork/builder.rb

@@ -18,7 +18,7 @@ class Embork::Builder
     @environment = Embork::Environment.new(@borkfile)
     @sprockets_environment = @environment.sprockets_environment
 
-    @version = Time.now.to_s.gsub(/( -|-| |:)/, '.')
+    @version = generate_version
 
     @sprockets_environment.context_class.use_bundled_assets = true
     @sprockets_environment.context_class.bundle_version = @version
@@ -129,6 +129,12 @@ class Embork::Builder
 
   protected
 
+  def generate_version
+    Dir.chdir @project_root do
+      `git rev-parse HEAD`.strip
+    end
+  end
+
   def generate_asset_list(config_path)
     config_pathname = Pathname.new config_path
 

data/lib/embork/cli.rb

@@ -16,7 +16,7 @@ class Embork::CLI < Thor
 
   desc "server [ENVIRONMENT]", %{run the development or production server}
   option :port, :type => :numeric, :default => 9292
-  option :host, :type => :string, :default => 'localhost'
+  option :host, :type => :string, :default => '0.0.0.0'
   option :bundle_version, :type => :string, :default => nil
   option :with_latest_bundle, :type => :boolean, :default => false
   option :enable_tests, :type => :boolean, :default => false
@@ -27,7 +27,7 @@ class Embork::CLI < Thor
 
   desc "phrender [ENVIRONMENT]", %{run phrender the prerenderer}
   option :port, :type => :numeric, :default => 9292
-  option :host, :type => :string, :default => 'localhost'
+  option :host, :type => :string, :default => '0.0.0.0'
   option :bundle_version, :type => :string, :default => nil
   option :with_latest_bundle, :type => :boolean, :default => false
   def phrender(environment = :development)
@@ -41,7 +41,7 @@ class Embork::CLI < Thor
     min = 52000
     max = 65000
     port = (Random.rand * (max - min) + min).to_i
-    host = 'localhost'
+    host = '0.0.0.0'
 
     server_options = {
       :host => host,
@@ -66,7 +66,9 @@ class Embork::CLI < Thor
     borkfile = Embork::Borkfile.new options[:borkfile], environment
     builder = Embork::Builder.new(borkfile)
     builder.build
-    builder.clean unless options[:keep_all_old_versions]
+    if !options[:keep_all_old_versions]
+      builder.clean
+    end
   end
 
   desc "clean", %{Remove all files under the build directory}

data/lib/embork/extension.rb

@@ -4,13 +4,18 @@ require 'embork/borkfile'
 class Embork::Extension
   attr_reader :project_root
 
-  def initialize(project_root, bundled_assets: false, environment: nil)
-    @environment = environment || Embork.env || ENV['RACK_ENV']
+  def initialize(project_root, options = {})
+    # Set up defaults
+    bundled_assets = options[:bundled_assets] || false
+    environment = options[:environment] || nil
+
+    @environment = environment || ENV['RACK_ENV'] || Embork.env
+    Embork.env = @environment
     @project_root = project_root
     if bundled_assets
       version_file_path = File.join(project_root, 'build',
                                     @environment.to_s, 'current-version')
-      @bundle_version = File.read(version_file_path)
+      @bundle_version = File.read(version_file_path).strip
       @use_bundled_assets = true
     end
   end

data/lib/embork/version.rb

@@ -1,3 +1,3 @@
 class Embork
-  VERSION = "0.0.11"
+  VERSION = "0.0.12"
 end

data/spec/embork/builder_spec.rb

@@ -51,25 +51,29 @@ describe 'Embork::Builder' do
 
   context '#clean' do
 
-    let(:older_stamp) { Time.now - 10 }
+    let(:versions) {
+      [
+        '49b65b48a44ead62720c1c649db8fb529f730bed',
+        'f15678d0862a572f898c54e50bc4f8e0bfcc5380',
+        '0779ed758aacf70705206964a7ebe79231f4537b',
+        'c5325c6a4bee73612f839b9b59e7bdfa566674cf',
+        '45c508baf8fafa8475e1b14a2169e69a1b51c2cb',
+      ]
+    }
     let(:expected_files) do
-      (1..4).map do |delta|
-        version = (older_stamp - delta).to_s.gsub(/ -| |-|:/, '.')
-        "application-#{version}.js"
-      end.push "application-#{@asset_bundle_version}.js"
+      versions[0..3].map do |v|
+        "application-%s.js" % v
+      end
     end
 
     let(:unexpected_files) do
-      (5..10).map do |delta|
-        version = (older_stamp - delta).to_s.gsub(/ -| |-|:/, '.')
-        "application-#{version}.js"
-      end
+      [ "application-%s.js" % @asset_bundle_version ]
     end
 
     before(:each) do
-      (1..10).each do |delta|
-        version = (older_stamp - delta).to_s.gsub(/ -| |-|:/, '.')
-        FileUtils.touch File.join(build_directory, "application-#{version}.js")
+      versions.each do |v|
+        FileUtils.touch File.join(build_directory, "application-%s.js" % v)
+        sleep 1 unless v == versions.last
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embork
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Mina Smart
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-14 00:00:00.000000000 Z
+date: 2014-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: 0.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: 0.0.5
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement