high_five 0.0.7 → 0.0.8

data/Gemfile.lock

@@ -3,9 +3,9 @@ PATH
   specs:
     high_five (0.0.7)
       compass (~> 0.12.2)
-      json
       sprockets (~> 2.9.0)
       thor (~> 0.17.0)
+      uglifier (~> 2.1.1)
       yui-compressor (~> 0.9.6)
 
 GEM
@@ -21,9 +21,10 @@ GEM
       fssm (>= 0.2.7)
       sass (~> 3.1)
     diff-lcs (1.2.1)
+    execjs (1.4.0)
+      multi_json (~> 1.0)
     fssm (0.2.10)
     hike (1.2.2)
-    json (1.7.7)
     multi_json (1.7.2)
     open4 (1.3.0)
     rack (1.5.2)
@@ -43,6 +44,9 @@ GEM
       tilt (~> 1.1, != 1.3.0)
     thor (0.17.0)
     tilt (1.3.7)
+    uglifier (2.1.1)
+      execjs (>= 0.3.0)
+      multi_json (~> 1.0, >= 1.0.2)
     yui-compressor (0.9.6)
       POpen4 (>= 0.1.4)
 

data/high_five.gemspec

@@ -18,8 +18,8 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "thor", "~>0.17.0"
   s.add_runtime_dependency "compass", "~>0.12.2"
   s.add_runtime_dependency "yui-compressor", "~>0.9.6"
+  s.add_runtime_dependency "uglifier", "~>2.1.1"
   s.add_runtime_dependency "sprockets", "~>2.9.0"
-  s.add_runtime_dependency "json"
   s.add_development_dependency "rspec", "~>2.13.0"
 
   s.files         = `git ls-files`.split("\n")

data/lib/high_five/cli.rb

@@ -11,7 +11,6 @@ module HighFive
     include HighFive::DeployTask
     include HighFive::AndroidTasks
     # source root path for Thor::Actions commands
-    
 
     class_option :version, type: :boolean, desc: "Print version and ext", aliases: "-v"
     def initialize(*args)

data/lib/high_five/config.rb

@@ -14,7 +14,8 @@ module HighFive
       :compass_dir,
       :js_settings, #serialized out to HighFive.Settings in index.html
       :is_environment, #boolean for if this config is an environment platform
-      :dev_index #copy generated index.html to here on build for use in development
+      :dev_index, #copy generated index.html to here on build for use in development
+      :minify #defaults to true in production mode and false otherwise, overridable
 
 
     def self.configure(&block) 
@@ -53,6 +54,7 @@ module HighFive
         new_config.asset_paths += self.asset_paths
         new_config.compass_dir ||= self.compass_dir
         new_config.dev_index ||= self.dev_index
+        new_config.minify ||= self.minify
         new_config.js_settings.merge! self.js_settings do |key, new_setting, old_setting| 
           new_setting || old_setting #don't clobber settings from the parent
         end
@@ -79,6 +81,7 @@ module HighFive
         self.dev_index = config.dev_index
         self.page_title = config.page_title
         self.meta = config.meta
+        self.minify = config.minify
       else
         @static_assets = []
         @static_javascripts = []
@@ -119,7 +122,11 @@ module HighFive
 
     def environment(name, &block)
       platform(name, &block)
-      @platform_configs[name.to_s].is_environment = true
+      platform_config = @platform_configs[name.to_s]
+      platform_config.is_environment = true
+      if (name.to_s == 'production')
+        platform_config.minify = :uglifier if platform_config.minify.nil?
+      end
     end
 
     def setting(hash)

data/lib/high_five/deploy_task.rb

@@ -1,5 +1,7 @@
 require 'sprockets'
 require 'sass'
+require 'uglifier'
+
 module HighFive
   module DeployTask 
 
@@ -26,13 +28,12 @@ module HighFive
           raise "Please set config.destination" if @config.destination.nil?
           self.destination_root = @config.destination
           FileUtils.rm_rf(self.destination_root)
+          FileUtils.mkdir_p(self.destination_root)
 
           #todo add to config
           say "Deploying app: <#{@platform}> <#{options[:environment]}>"
           say "\t#{self.destination_root}"
           say " -Weinre url: #{@weinre_url}" if @weinre_url
-
-
           
           if @config.compass_dir
             compass_dir = File.join(base_config.root, @config.compass_dir)
@@ -65,8 +66,22 @@ module HighFive
           if (@environment == "production")
             appjs = File.join(self.destination_root, "app.js")
             @javascripts = ["app.js"]
-            say "      create  #{appjs}", :green
-            bundle.write_to(appjs)
+            
+            output_js = nil
+            if @config.minify  == :uglifier
+              say "      uglify  #{appjs}", :green
+              output_js = Uglifier.compile(bundle.to_s)
+            elsif @config.minify == :yui
+              say "      minify  #{appjs}", :green
+              output_js = YUI::JavaScriptCompressor.new.compress(bundle.to_s)
+            else
+              say "      create  #{appjs}", :green
+              output_js = bundle.to_s
+            end
+            File.open(appjs, "w") do |file| 
+              file.write output_js
+            end
+            output_js = nil
           else
             # Add each of the javascript files to the generated folder
             @javascripts = []
@@ -121,7 +136,7 @@ module HighFive
           # Build index.html
           say "Generating index.html"
           template File.join(@config_root, "index.html.erb"), File.join(self.destination_root, "index.html")
-          if (@config.dev_index)
+          if (@environment == 'development' && !@config.dev_index.nil?)
             say "Cloning to #{@config.dev_index}"
             FileUtils.cp(File.join(self.destination_root, "index.html"), File.join(@config.root, @config.dev_index))
           end

data/lib/high_five/version.rb

@@ -1,3 +1,3 @@
 module HighFive
-    VERSION = "0.0.7"
+    VERSION = "0.0.8"
 end

data/spec/config_spec.rb

@@ -76,6 +76,13 @@ describe HighFive::Config do
       config.js_settings.should be_has_key(:base_url)
       config.js_settings.should be_has_key(:android_flag)
     end
+
+    it "sets minify to true by default for production environments" do
+      config = @config.build_platform_config('android').build_platform_config('production')
+      config.minify.should eq :uglifier
+      config = @config.build_platform_config(:production).build_platform_config(:android)
+      config.minify.should eq :uglifier
+    end
   end
 
   context "easy settings" do

data/spec/deploy_spec.rb

@@ -8,8 +8,8 @@ describe HighFive::DeployTask do
     FileUtils.cp_r(Dir[File.join(File.dirname(__FILE__), "dummy", "*")], @project_root)
   end
 
-  def cli
-    cli = HighFive::Cli.new
+  def cli(options={environment: 'development'})
+    cli = HighFive::Cli.new([], options)
     cli.instance_variable_set("@base_config", HighFive::Config.instance)
     cli
   end
@@ -30,9 +30,8 @@ describe HighFive::DeployTask do
         config.platform :android do |android|
         
         end
-
-        cli.deploy("android")
       end
+      cli.deploy("android")
     end
 
     after(:all) { destroy_dummy_app! }
@@ -59,19 +58,18 @@ describe HighFive::DeployTask do
         config.platform :android do |android|
         
         end
-
-        cli.deploy("android")
       end
+      cli.deploy("android")
     end
 
     after(:all) { destroy_dummy_app! }
 
     it "should invoke compass to compile stylesheets" do 
-      expect(File.join(@project_root, "stylesheets", "screen.css")).to exist
+      expect(File.join(@project_root, "stylesheets", "sass.css")).to exist
+      expect(File.join(@project_root, "www", "stylesheets", "sass.css")).to exist
     end
 
     it "should copy the css sheets to the deploy directory" do 
-      pending "better compass integration"
       expect(File.join(@project_root, "www", "stylesheets", "screen.css")).to exist
     end
   end
@@ -88,17 +86,46 @@ describe HighFive::DeployTask do
           config.destination "www-web"
           config.dev_index "index-debug.html"
         end
-
-        cli.deploy("web")
       end
+      cli.deploy("web")
     end
 
+    after(:all) { destroy_dummy_app! }
+
     it "should clone index.html to index-debug.html when directed" do 
       index = File.read(File.join(@project_root, "www-web", "index.html"))
-
       index_debug = File.read(File.join(@project_root, "index-debug.html"))
       index.should eq index_debug
     end
   end
 
+  context "Production environment" do 
+    before :all do
+      create_dummy_app!
+      HighFive::Config.configure do |config|
+        config.root = @project_root
+        config.destination = "www"
+        config.compass_dir = "."
+        config.assets "stylesheets"
+        config.platform :web do |web|
+           config.dev_index "index-debug.html"
+        end
+        config.environment :production do |prod|
+
+        end
+        
+      end
+      cli(environment: 'production').deploy("web")
+    end
+
+    after(:all) { destroy_dummy_app! }
+
+    it "should produce just one javascript file" do 
+      expect(File.join(@project_root, "www", "app.js")).to exist
+    end
+    it "should not clone index.html to index-debug.html" do 
+      File.exist?(File.join(@project_root, "index-debug.html")).should be_false
+    end
+  end
+
 end

data/spec/dummy/javascripts/app.js

@@ -1 +1,7 @@
-alert("This application is awesome!");
+alert("This application is awesome!");
+alert("This is a second line of code");
+
+function test() {
+    var my_long_variable_name = "Something!";
+    alert(my_long_variable_name);
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: high_five
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -60,13 +60,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.9.6
 - !ruby/object:Gem::Dependency
-  name: sprockets
+  name: uglifier
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.9.0
+        version: 2.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,23 +74,23 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.9.0
+        version: 2.1.1
 - !ruby/object:Gem::Dependency
-  name: json
+  name: sprockets
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.9.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -148,11 +148,7 @@ files:
 - spec/dummy/config/high_five/index.html.erb
 - spec/dummy/javascripts/app.js
 - spec/dummy/javascripts/app/component.js
-- spec/dummy/sass/ie.scss
-- spec/dummy/sass/print.scss
-- spec/dummy/sass/screen.scss
-- spec/dummy/stylesheets/ie.css
-- spec/dummy/stylesheets/print.css
+- spec/dummy/sass/sass.scss
 - spec/dummy/stylesheets/screen.css
 - spec/init_spec.rb
 - spec/spec_helper.rb
@@ -197,11 +193,7 @@ test_files:
 - spec/dummy/config/high_five/index.html.erb
 - spec/dummy/javascripts/app.js
 - spec/dummy/javascripts/app/component.js
-- spec/dummy/sass/ie.scss
-- spec/dummy/sass/print.scss
-- spec/dummy/sass/screen.scss
-- spec/dummy/stylesheets/ie.css
-- spec/dummy/stylesheets/print.css
+- spec/dummy/sass/sass.scss
 - spec/dummy/stylesheets/screen.css
 - spec/init_spec.rb
 - spec/spec_helper.rb

data/spec/dummy/sass/ie.scss

@@ -1,5 +0,0 @@
-/* Welcome to Compass. Use this file to write IE specific override styles.
- * Import this file using the following HTML or equivalent:
- * <!--[if IE]>
- *   <link href="/stylesheets/ie.css" media="screen, projection" rel="stylesheet" type="text/css" />
- * <![endif]--> */

data/spec/dummy/sass/print.scss

@@ -1,3 +0,0 @@
-/* Welcome to Compass. Use this file to define print styles.
- * Import this file using the following HTML or equivalent:
- * <link href="/stylesheets/print.css" media="print" rel="stylesheet" type="text/css" /> */

data/spec/dummy/stylesheets/ie.css

@@ -1,5 +0,0 @@
-/* Welcome to Compass. Use this file to write IE specific override styles.
- * Import this file using the following HTML or equivalent:
- * <!--[if IE]>
- *   <link href="/stylesheets/ie.css" media="screen, projection" rel="stylesheet" type="text/css" />
- * <![endif]--> */

data/spec/dummy/stylesheets/print.css

@@ -1,3 +0,0 @@
-/* Welcome to Compass. Use this file to define print styles.
- * Import this file using the following HTML or equivalent:
- * <link href="/stylesheets/print.css" media="print" rel="stylesheet" type="text/css" /> */