embarista 1.1.5 → 2.0.3

data/lib/embarista/tasks.rb

@@ -1,2 +1,7 @@
 require 'embarista/tasks/coffeelint'
 require 'embarista/tasks/updater'
+require 'embarista/tasks/assets'
+require 'embarista/tasks/generate_index'
+require 'embarista/tasks/upload_index'
+require 'embarista/tasks/generate_s3_index'
+require 'embarista/tasks/set_current_index'

data/lib/embarista/tasks/assets.rb

@@ -0,0 +1,41 @@
+require 'rake'
+require 'rake/tasklib'
+
+module Embarista
+  class AssetsTask < ::Rake::TaskLib
+    attr_accessor :name, :app, :assets_bucket
+
+    def initialize(name = :assets)
+      @name = name
+
+      yield self if block_given?
+
+      @assets_bucket ||= App.assets_bucket
+
+      raise 'app must be set' unless @app
+      define
+    end
+
+    private
+    def define
+      assets_task = task name, :manifest_id do |t, args|
+        manifest_id = args[:manifest_id] || App.latest_manifest_id
+
+        raise "assets distro not found for ID #{manifest_id}" unless File.exist? "tmp/public/#{manifest_id}.yml"
+
+        Embarista::S3sync.sync('tmp/public',
+          bucket_name: assets_bucket,
+          local_manifest_path: "#{manifest_id}.yml",
+          remote_manifest_path: "#{app}-manifest-latest.yml",
+        )
+        puts generate_index_command(t, manifest_id)
+      end
+      assets_task.add_description "deploy assets to S3"
+    end
+
+    def generate_index_command(task, manifest_id)
+      generate_index_task_name = ::Rake::Task.scope_name(task.scope, 'generate_index')
+      "#{App.env_var}=qa|prod be rake \"#{generate_index_task_name}[#{manifest_id}]\""
+    end
+  end
+end

data/lib/embarista/tasks/generate_index.rb

@@ -0,0 +1,46 @@
+require 'rake'
+require 'rake/tasklib'
+
+module Embarista
+  class GenerateIndexTask < ::Rake::TaskLib
+    attr_accessor :name, :erb_path, :app, :redis
+
+    def initialize(name = :generate_index)
+      @name = name
+      @erb_path = "app/index.html.erb"
+
+      yield self if block_given?
+
+      @redis ||= Redis.client
+
+      raise 'app must be set' unless @app
+      define
+    end
+
+    private
+    def define
+      generate_index_task = task name, :manifest_id do |t, args|
+        manifest_id = args[:manifest_id] || App.env.to_s
+        generator = DynamicIndex::Generator.generator(erb_path, manifest_id)
+        html = generator.html
+
+        puts "redis.set('#{app}:index:#{manifest_id}', '#{html[0,10].strip}...')"
+
+        redis.set("#{app}:index:#{manifest_id}", html)
+
+        puts "To preview: #{preview_url(app, manifest_id)}"
+        puts "To activate: #{set_current_command(t, manifest_id)}"
+      end
+      generate_index_task.add_description "Generate a manifest for the specified #{App.env_var}, run once with dev to boostrap environment"
+    end
+
+    def preview_url(app, manifest_id)
+      "#{App.app_base_url}/#{app}/?manifest_id=#{manifest_id}"
+    end
+
+    def set_current_command(task, manifest_id)
+      set_current_task_name = ::Rake::Task.scope_name(task.scope, 'set_current_index')
+      "#{App.env_var}=#{App.env} rake \"#{set_current_task_name}[#{manifest_id}]\""
+    end
+  end
+end

data/lib/embarista/tasks/generate_s3_index.rb

@@ -0,0 +1,33 @@
+require 'rake'
+require 'rake/tasklib'
+
+module Embarista
+  class GenerateS3IndexTask < ::Rake::TaskLib
+    attr_accessor :name, :erb_path, :app, :assets_bucket
+
+    def initialize(name = :generate_s3_index)
+      @name = name
+      @erb_path = "app/index.html.erb"
+
+      yield self if block_given?
+
+      @assets_bucket ||= App.assets_bucket
+
+      raise 'app must be set' unless @app
+      define
+    end
+
+    private
+    def define
+      generate_s3_index_task = task name, :manifest_id do |t, args|
+        manifest_id = args[:manifest_id] || App.latest_manifest_id
+        generator = DynamicIndex::Generator.generator(erb_path, manifest_id, "//s3.amazonaws.com/#{assets_bucket}")
+        io = StringIO.new(generator.html)
+
+        s3 = S3.new(assets_bucket)
+        s3.store("#{app}/index-#{App.env}.html", io)
+      end
+      generate_s3_index_task.add_description "Generate a index for the app and deploy it to S3"
+    end
+  end
+end

data/lib/embarista/tasks/set_current_index.rb

@@ -0,0 +1,31 @@
+require 'rake'
+require 'rake/tasklib'
+
+module Embarista
+  class SetCurrentIndexTask < ::Rake::TaskLib
+    attr_accessor :name, :app, :key, :redis
+
+    def initialize(name = :set_current_index, key = 'index')
+      @name = name
+      @key = key
+
+      yield self if block_given?
+
+      @redis ||= Redis.client
+
+      raise 'app must be set' unless @app
+      define
+    end
+
+    private
+    def define
+      set_current_task = task(name, :manifest_id) do |t, args|
+        manifest_id = args[:manifest_id] || App.env.to_s
+
+        puts "redis.set('#{app}:#{key}:current', '#{manifest_id}')"
+        redis.set("#{app}:#{key}:current", manifest_id)
+      end
+      set_current_task.add_description "Activates a manifest in the given #{App.env_var}"
+    end
+  end
+end

data/lib/embarista/tasks/updater.rb

@@ -22,9 +22,9 @@ module Embarista
       end
 
       def define
-        task name do |t, args|
+        update_ember_task = task name do |t, args|
           old_sha, new_sha = nil, nil
-          regexp = /ember-([0-9a-f]{40})/
+          regexp = /ember-([0-9a-f]{4,40})/
           app_vendor_path = File.expand_path("app/vendor")
           cd(app_vendor_path) do
             old_filename = Dir['*'].grep(regexp)[0]
@@ -34,21 +34,26 @@ module Embarista
           raise "Couldn't find current ember.js version" if old_sha.nil?
           cd('../ember.js') do
             new_sha = `git rev-parse HEAD`.chomp
-            `bundle && bundle exec rake dist`
+            Bundler.with_clean_env do
+              `bundle && bundle exec rake dist`
+            end
             cd('./dist') do
               cp('ember.js', "#{app_vendor_path}/ember-#{new_sha}.js")
               cp('ember.min.js', "#{app_vendor_path}/ember-#{new_sha}.min.js")
+              cp('ember-template-compiler.js', "#{app_vendor_path}/ember-template-compiler-#{new_sha}.js")
             end
           end
           if old_sha != new_sha
             cd(app_vendor_path) do
               rm("ember-#{old_sha}.js")
               rm("ember-#{old_sha}.min.js")
+              rm("ember-template-compiler-#{old_sha}.js")
             end
             Embarista::Updater.update_asset_file(old_sha, new_sha)
           end
           puts "Updated from #{old_sha} to #{new_sha}"
         end
+        update_ember_task.add_description "Update Ember from a repo in ../ember.js"
       end
     end
 
@@ -62,9 +67,9 @@ module Embarista
       end
 
       def define
-        task name do |t, args|
+        update_ember_data_task = task name do |t, args|
           old_sha, new_sha = nil, nil
-          regexp = /ember-data-([0-9a-f]{40})/
+          regexp = /ember-data-([0-9a-f]{4,40})/
           app_vendor_path = File.expand_path("app/vendor")
           cd(app_vendor_path) do
             old_filename = Dir['*'].grep(regexp)[0]
@@ -74,7 +79,9 @@ module Embarista
           raise "Couldn't find current ember-data js version" if old_sha.nil?
           cd('../ember-data') do
             new_sha = `git rev-parse HEAD`.chomp
-            `bundle && bundle exec rake dist`
+            Bundler.with_clean_env do
+              `npm install; ./node_modules/.bin/grunt dist`
+            end
             cd('./dist') do
               cp('ember-data.js', "#{app_vendor_path}/ember-data-#{new_sha}.js")
               cp('ember-data.min.js', "#{app_vendor_path}/ember-data-#{new_sha}.min.js")
@@ -89,6 +96,76 @@ module Embarista
           end
           puts "Updated from #{old_sha} to #{new_sha}"
         end
+        update_ember_data_task.add_description "Update Ember data from a repo in ../ember-data"
+      end
+    end
+
+    class UpdateEmberStatesTask < ::Rake::TaskLib
+      attr_accessor :name
+
+      def initialize(name = :update_ember_states)
+        @name = name
+        yield self if block_given?
+        define
+      end
+
+      def define
+        update_ember_states_task = task name do |t, args|
+          old_sha, new_sha = nil, nil
+          regexp = /ember-states-([0-9a-f]{40})/
+          app_vendor_path = File.expand_path("app/vendor")
+          cd(app_vendor_path) do
+            old_filename = Dir['*'].grep(regexp)[0]
+            old_filename =~ regexp
+            old_sha = $1
+          end
+          raise "Couldn't find current ember-states js version" if old_sha.nil?
+          cd('../ember-states') do
+            new_sha = `git rev-parse HEAD`.chomp
+            Bundler.with_clean_env do
+              `bundle && bundle exec rake dist`
+            end
+            cd('./dist') do
+              cp('ember-states.js', "#{app_vendor_path}/ember-states-#{new_sha}.js")
+              cp('ember-states.min.js', "#{app_vendor_path}/ember-states-#{new_sha}.min.js")
+            end
+          end
+          if old_sha != new_sha
+            cd(app_vendor_path) do
+              rm("ember-states-#{old_sha}.js")
+              rm("ember-states-#{old_sha}.min.js")
+            end
+            Embarista::Updater.update_asset_file(old_sha, new_sha)
+          end
+          puts "Updated from #{old_sha} to #{new_sha}"
+        end
+        update_ember_states_task.add_description "Update Ember States from a repo in ../ember-states"
+      end
+    end
+
+    class UpdateQunitTask < ::Rake::TaskLib
+      attr_accessor :name
+
+      def initialize(name = :update_qunit)
+        @name = name
+        yield self if block_given?
+        define
+      end
+
+      def define
+        update_qunit_task = task name do |t, args|
+          version = ENV['VERSION']
+          raise "please supply VERSION env var to specify QUnit version (specify \"git\" for nightly)" if version.nil?
+          cd('./test/vendor') do
+            # remove old qunit
+            rm Dir['qunit-*.js']
+            rm Dir['qunit-*.css']
+            sh "curl -O http://code.jquery.com/qunit/qunit-#{version}.js"
+            sh "curl -O http://code.jquery.com/qunit/qunit-#{version}.css"
+          end
+          puts "Updated to QUnit #{version}"
+        end
+        update_qunit_task.add_description "Update QUnit to VERSION from code.jquery.com"
       end
     end
 
@@ -102,7 +179,7 @@ module Embarista
       end
 
       def define
-        task name do |t, args|
+        update_jquery_task = task name do |t, args|
           version = ENV['VERSION']
           raise "please supply VERSION env var to specify jQuery version" if version.nil?
           cd('./app/vendor') do
@@ -111,9 +188,38 @@ module Embarista
             sh "curl -O http://code.jquery.com/jquery-#{version}.js"
             sh "curl -O http://code.jquery.com/jquery-#{version}.min.js"
           end
-          Embarista::Updater.update_asset_file(%r{JQUERY_VERSION = '\d+\.\d+\.\d+'}, "JQUERY_VERSION = '#{version}'")
+          Embarista::Updater.update_asset_file(%r{JQUERY_VERSION = '[^']+'}, "JQUERY_VERSION = '#{version}'")
           puts "Updated to jQuery #{version}"
         end
+        update_jquery_task.add_description "Update jQuery to VERSION from code.jquery.com"
+      end
+    end
+
+    class UpdateHandlebarsTask < ::Rake::TaskLib
+      attr_accessor :name
+
+      def initialize(name = :update_handlebars)
+        @name = name
+        yield self if block_given?
+        define
+      end
+
+      def define
+        update_handlebars_task = task name do |t, args|
+          version = ENV['VERSION']
+          raise "please supply VERSION env var to specify Handlebars version (specify \"git\" for nightly)" if version.nil?
+          cd('./app/vendor') do
+            # remove old qunit
+            rm Dir['handlebars-*.js']
+            rm Dir['handlebars.runtime-*.js']
+            sh "curl http://builds.handlebarsjs.com.s3.amazonaws.com/handlebars-#{version}.js > handlebars-#{version}.js"
+            sh "curl http://builds.handlebarsjs.com.s3.amazonaws.com/handlebars.runtime-#{version}.js > handlebars.runtime-#{version}.js"
+            sh "uglifyjs < handlebars.runtime-#{version}.js > handlebars.runtime-#{version}.min.js"
+          end
+          Embarista::Updater.update_asset_file(%r{HANDLEBARS_VERSION = '[^']+'}, "HANDLEBARS_VERSION = '#{version}'")
+          puts "Updated to Handlebars #{version}"
+        end
+        update_handlebars_task.add_description "Update Handlebars to VERSION from github.com/wycats/handlebars.js"
       end
     end
 

data/lib/embarista/tasks/upload_index.rb

@@ -0,0 +1,45 @@
+require 'rake'
+require 'rake/tasklib'
+
+module Embarista
+  class UploadIndexTask < ::Rake::TaskLib
+    attr_accessor :name, :erb_path, :app, :redis
+
+    def initialize(name = :upload_index)
+      @name = name
+      @html_path = "dist/index.html"
+
+      yield self if block_given?
+
+      @redis ||= Redis.client
+
+      raise 'app must be set' unless @app
+      define
+    end
+
+    private
+    def define
+      generate_index_task = task name, :manifest_id do |t, args|
+        manifest_id = args[:manifest_id] || App.env.to_s
+        html = File.read(@html_path)
+
+        puts "redis.set('#{app}:index:#{manifest_id}', '#{html[0,10].strip}...')"
+
+        redis.set("#{app}:index:#{manifest_id}", html)
+
+        puts "To preview: #{preview_url(app, manifest_id)}"
+        puts "To activate: #{set_current_command(t, manifest_id)}"
+      end
+      generate_index_task.add_description "Upload index file at dist/index.html to redis, run once with dev to boostrap environment"
+    end
+
+    def preview_url(app, manifest_id)
+      "#{App.app_base_url}/#{app}/?manifest_id=#{manifest_id}"
+    end
+
+    def set_current_command(task, manifest_id)
+      set_current_task_name = ::Rake::Task.scope_name(task.scope, 'set_current_index')
+      "#{App.env_var}=#{App.env} rake \"#{set_current_task_name}[#{manifest_id}]\""
+    end
+  end
+end

data/lib/embarista/version.rb

@@ -1,3 +1,3 @@
 module Embarista
-  VERSION = '1.1.5'
+  VERSION = '2.0.3'
 end

data/spec/manifest_builder_spec.rb

@@ -53,20 +53,20 @@ CONTENT
 
 
       subject.add('public/foo/bar/hello.txt')
-      File.exist?('tmp/public/foo/bar/hello-8ddd8be4b179a529afa5f2ffae4b9858.txt').should be_true
+      File.exist?('tmp/public/foo/bar/hello-8ddd8be4b179a529afa5f2ffae4b9858.txt').should eq(true)
       subject.manifest.should == {
         '/foo/bar/hello.txt' => '/foo/bar/hello-8ddd8be4b179a529afa5f2ffae4b9858.txt'
       }
 
       subject.add('public/foo/baz/goodbye.txt')
-      File.exist?('tmp/public/foo/baz/goodbye-8dcca69d946ae9576734c2c91dfddec4.txt').should be_true
+      File.exist?('tmp/public/foo/baz/goodbye-8dcca69d946ae9576734c2c91dfddec4.txt').should eq(true)
       subject.manifest.should == {
         '/foo/bar/hello.txt' => '/foo/bar/hello-8ddd8be4b179a529afa5f2ffae4b9858.txt',
         '/foo/baz/goodbye.txt' => '/foo/baz/goodbye-8dcca69d946ae9576734c2c91dfddec4.txt'
       }
 
       subject.add('images/foo.png', 'editor/images/foo.png')
-      File.exist?('tmp/public/editor/images/foo-4802fcebd761ca4f04c9a6320330fd10.png').should be_true
+      File.exist?('tmp/public/editor/images/foo-4802fcebd761ca4f04c9a6320330fd10.png').should eq(true)
       subject.manifest.should == {
         '/foo/bar/hello.txt' => '/foo/bar/hello-8ddd8be4b179a529afa5f2ffae4b9858.txt',
         '/foo/baz/goodbye.txt' => '/foo/baz/goodbye-8dcca69d946ae9576734c2c91dfddec4.txt',

data/spec/manifest_url_filter_spec.rb

@@ -7,7 +7,9 @@ describe Embarista::Filters::ManifestUrlFilter do
 <<-JS
 var a = manifest_url('baz.jpg');
 var b = manifest_url("baz/bar.jpg");
-var c = manifest_url("doesnt-exist.jpg");
+var c = manifest_url("baz/bar.jpg#bay");
+var d = manifest_url("baz/bar.jpg?#bay");
+var e = manifest_url("doesnt-exist.jpg");
 JS
   }
 
@@ -58,7 +60,9 @@ JS
     file.body.should eq(<<-JS)
 var a = ('//' + YappEditorConfig.assetsCdn + '/editor/images/baz-123abc.jpg');
 var b = ('//' + YappEditorConfig.assetsCdn + '/editor/images/baz/bar-456def.jpg');
-var c = ('//' + YappEditorConfig.assetsCdn + '/editor/images/doesnt-exist.jpg');
+var c = ('//' + YappEditorConfig.assetsCdn + '/editor/images/baz/bar-456def.jpg#bay');
+var d = ('//' + YappEditorConfig.assetsCdn + '/editor/images/baz/bar-456def.jpg?#bay');
+var e = ('//' + YappEditorConfig.assetsCdn + '/editor/images/doesnt-exist.jpg');
 JS
     file.encoding.should eq('UTF-8')
   end
@@ -72,7 +76,9 @@ JS
     file.body.should eq(<<-JS)
 var a = ('//' + YappEditorConfig.assetsCdn + '/editor/images/baz.jpg');
 var b = ('//' + YappEditorConfig.assetsCdn + '/editor/images/baz/bar.jpg');
-var c = ('//' + YappEditorConfig.assetsCdn + '/editor/images/doesnt-exist.jpg');
+var c = ('//' + YappEditorConfig.assetsCdn + '/editor/images/baz/bar.jpg#bay');
+var d = ('//' + YappEditorConfig.assetsCdn + '/editor/images/baz/bar.jpg?#bay');
+var e = ('//' + YappEditorConfig.assetsCdn + '/editor/images/doesnt-exist.jpg');
 JS
     file.encoding.should eq('UTF-8')
   end