embork 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d18393fa8f72cada548910072121d0ed13d7fe22
-  data.tar.gz: 08105e21003afa74345ae86a79675d3cb8aa0d91
+  metadata.gz: 9070b93c526dd9629b5aead7b7b6aebd26fb862f
+  data.tar.gz: fd7f83264cf1ef557b651e2aa949a963c7efaf59
 SHA512:
-  metadata.gz: 83117aeceb898442de7446e761e23aaaadc04bbc93599ed55ce6d9a26a07da3e5f4414352731d080df8605c87a3c691705ca033ec4da8bd7725366f4a40a9b5f
-  data.tar.gz: 52cda448b0673f535cdd4883e28d55316c655a5bd7cf79c8bb2dfef251c036613e72b5938fd785ccc883f9a51248f3ec222e503d72872fb356bf5e2cb280a019
+  metadata.gz: a842ca8cf62a16dc71b252f7cf60d4dc1570d30e5bd326948e7a7950ead0b8589ba988b0fbb82c5ef695eae3e84020693bdd0d64d920bcaf3f86588b1b09aab6
+  data.tar.gz: cc66126749406cff1a69358714aebde2d47d9831a0fdc722a5bd3032c3930160b5b4655c31e586bc4feb4bbca421a2623c57fba72e85c61220c3c9ae5238411d

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.0.13
+- Remove the ability to have embork clean up old versions. This is better
+  outsourced to your deployment solution. Also it was buggy.
+
 # 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.

data/blueprint/Borkfile

@@ -1,8 +1,6 @@
 # vim: set ft=ruby:
 # Borkfile
 
-keep_old_versions 5
-
 set_project_root '.'
 
 # Add paths:

data/lib/embork/borkfile.rb

@@ -24,10 +24,6 @@ class Embork::Borkfile
       @phrender_index_file = index_file_path || @phrender_index_file
     end
 
-    def keep_old_versions(number_to_keep = nil)
-      @keep_old_versions = number_to_keep || @keep_old_versions
-    end
-
     def es6_namespace(namespace = nil)
       @es6_namespace = namespace || @es6_namespace
     end
@@ -49,7 +45,6 @@ class Embork::Borkfile
       @project_root = nil
       @html = []
       @backend = :static_index
-      @keep_old_versions = 5
       @es6_namespace = nil
       @frameworks = []
       @logger = logger

data/lib/embork/builder.rb

@@ -4,11 +4,8 @@ require 'find'
 require 'sprockets'
 
 require 'embork/environment'
-require 'embork/build_versions'
 
 class Embork::Builder
-  include Embork::BuildVersions
-
   def initialize(borkfile)
     @borkfile = borkfile
     @project_root = @borkfile.project_root
@@ -95,34 +92,6 @@ class Embork::Builder
     @version
   end
 
-  def clean
-    versions = sorted_versions @project_root
-
-    # If there are more than our threshold
-    if versions.length > @borkfile.keep_old_versions
-
-      # Grab the versions to keep
-      retained_versions = versions[0...@borkfile.keep_old_versions]
-      build_path = File.join(@project_root, 'build', Embork.env.to_s)
-
-      Find.find(build_path) do |file|
-        name = File.basename(file)
-
-        # Skip if this is an unversioned file
-        next unless version_name(file)
-
-        # If any version strings that we should retain are in the file name,
-        # skip to next. Otherwise, obliterate.
-        if retained_versions.any?{ |version| name.include?(version) }
-          next
-        else
-          Dir.chdir(build_path){ FileUtils.rm file }
-        end
-      end
-    end
-
-  end
-
   def clean!
     FileUtils.rm_rf File.join(@project_root, 'build', Embork.env.to_s)
   end

data/lib/embork/cli.rb

@@ -60,15 +60,11 @@ class Embork::CLI < Thor
   end
 
   desc "build [ENVIRONMENT]", %{build the project in the 'build' directory}
-  option :keep_all_old_versions, :type => :boolean, :default => false,
-    :desc => %{By default, older versions of the project are removed, only keeping the last few versions. This flag keeps all old versions.}
+  option :desc => %{By default, older versions of the project are removed, only keeping the last few versions. This flag keeps all old versions.}
   def build(environment = :production)
     borkfile = Embork::Borkfile.new options[:borkfile], environment
     builder = Embork::Builder.new(borkfile)
     builder.build
-    if !options[:keep_all_old_versions]
-      builder.clean
-    end
   end
 
   desc "clean", %{Remove all files under the build directory}

data/lib/embork/server.rb

@@ -4,11 +4,8 @@ require 'webrick'
 require 'embork/environment'
 require 'embork/pushstate'
 require 'embork/forwarder'
-require 'embork/build_versions'
 
 class Embork::Server
-  include Embork::BuildVersions
-
   attr_reader :backend
   attr_reader :project_root
   attr_reader :sprockets_environment
@@ -23,7 +20,7 @@ class Embork::Server
       Embork.bundle_version = options[:bundle_version]
       setup_bundled_mode
     elsif options[:with_latest_bundle]
-      Embork.bundle_version = sorted_versions(@borkfile.project_root).first
+      Embork.bundle_version = File.read(File.join(borkfile.project_root, Embork.env, current-version))
       setup_bundled_mode
     elsif options[:enable_tests]
       setup_test_mode

data/lib/embork/version.rb

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

data/spec/embork/borkfile/Borkfile.full

@@ -1,7 +1,5 @@
 # vim: set ft=ruby:
 
-keep_old_versions 10
-
 set_project_root '/tmp/project_root'
 
 append_asset_path 'foo/css'

data/spec/embork/borkfile_spec.rb

@@ -35,10 +35,6 @@ describe 'Embork::Borkfile' do
       expect(borkfile.html).to be_empty
     end
 
-    it 'keeps five old versions' do
-      expect(borkfile.keep_old_versions).to eq(5)
-    end
-
     it 'has no es6 module namespace defined' do
       expect(borkfile.es6_namespace).to eq(nil)
     end
@@ -101,10 +97,6 @@ describe 'Embork::Borkfile' do
       expect(borkfile.backend).to eq(:static_index)
     end
 
-    it 'keeps the specified number of old versions' do
-      expect(borkfile.keep_old_versions).to eq(10)
-    end
-
     it 'sets up an es6 module namespace' do
       expect(borkfile.es6_namespace).to eq('my-package')
     end

data/spec/embork/builder_spec.rb

@@ -49,43 +49,6 @@ describe 'Embork::Builder' do
     expect(built_files).to match_array(expected_files.map{ |f| f % [ @asset_bundle_version ] })
   end
 
-  context '#clean' do
-
-    let(:versions) {
-      [
-        '49b65b48a44ead62720c1c649db8fb529f730bed',
-        'f15678d0862a572f898c54e50bc4f8e0bfcc5380',
-        '0779ed758aacf70705206964a7ebe79231f4537b',
-        'c5325c6a4bee73612f839b9b59e7bdfa566674cf',
-        '45c508baf8fafa8475e1b14a2169e69a1b51c2cb',
-      ]
-    }
-    let(:expected_files) do
-      versions[0..3].map do |v|
-        "application-%s.js" % v
-      end
-    end
-
-    let(:unexpected_files) do
-      [ "application-%s.js" % @asset_bundle_version ]
-    end
-
-    before(:each) do
-      versions.each do |v|
-        FileUtils.touch File.join(build_directory, "application-%s.js" % v)
-        sleep 1 unless v == versions.last
-      end
-    end
-
-    it 'keeps :keep_old_versions number of versions' do
-      # This is what we're testing
-      builder.clean
-
-      expect(built_files).to include(*expected_files)
-      expect(built_files).not_to include(*unexpected_files)
-    end
-  end
-
   context 'asset_helpers' do
     let(:index_read) { File.read File.join(build_directory, 'index.html') }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embork
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Mina Smart
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-25 00:00:00.000000000 Z
+date: 2014-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets
@@ -318,7 +318,6 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- TODO.md
 - bin/embork
 - blueprint/Borkfile
 - blueprint/Gemfile
@@ -365,7 +364,6 @@ files:
 - embork.gemspec
 - lib/embork.rb
 - lib/embork/borkfile.rb
-- lib/embork/build_versions.rb
 - lib/embork/builder.rb
 - lib/embork/cli.rb
 - lib/embork/environment.rb

data/TODO.md

@@ -1,16 +0,0 @@
-TODO
-====
-
-- [x] add helpers to run from built or generated files
-- [x] Add html files to Borkfile. Discreet list of what to build. Don't assume.
-- [x] Use no cache for erb files.
-- [x] Add `:keep_old_versions` to Borkfile to configure the number of old versions
-- [x] Create full blown example project.
-- [x] Create blank Borkfile with all options presented and probably commented out.
-- [x] Make module transpiler ignore components
-- [x] Create cli to run server.
-- [x] Add jj-abrams resolver
-- [ ] Extend cli with clean, and hint
-- [ ] add hint task
-- [ ] build in qunit-runner
-- [ ] build in prerender

data/lib/embork/build_versions.rb

@@ -1,29 +0,0 @@
-module Embork::BuildVersions
-  VERSION_FORMAT_EXP = /[a-f0-9]{40}\.js/
-
-  def sorted_versions(project_root)
-    build_path = File.join(project_root, 'build', Embork.env.to_s)
-
-    versioned_files = []
-    Find.find(build_path) do |file|
-      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.reverse
-  end
-
-  def version_name(filename)
-    if match = filename.match(VERSION_FORMAT_EXP)
-      match[0]
-    else
-      nil
-    end
-  end
-end