high_five 0.0.3 → 0.0.4

data/.gitignore

@@ -1,2 +1,3 @@
 .DS_Store
 *.gem
+.sass-cache

data/bin/hi5

@@ -12,7 +12,6 @@ rescue LoadError
   require 'rubygems'
   require 'high_five'
 end
-HighFive::ROOT = Dir.pwd
 require 'high_five/cli'
 
 HighFive::Cli.start

data/lib/high_five/android_tasks.rb

@@ -6,7 +6,7 @@ module HighFive
         namespace "android"
         desc "android_debug", "build the debug apk via ant debug"
         def android_debug
-          self.destination_root = HighFive::ROOT
+          self.destination_root = base_config.root
           puts "Debugy"
         end
 

data/lib/high_five/cli.rb

@@ -11,12 +11,11 @@ module HighFive
     include HighFive::DeployTask
     include HighFive::AndroidTasks
     # source root path for Thor::Actions commands
-    source_root(HighFive::ROOT)
+    
 
     class_option :version, type: :boolean, desc: "Print version and ext", aliases: "-v"
     def initialize(*args)
       super
-      
       if options[:version]
         puts "HighFive #{HighFive::VERSION}" 
         Process.exit(0)

data/lib/high_five/config.rb

@@ -8,17 +8,22 @@ module HighFive
       :static_javascripts,
       :static_stylesheets,
       :sass_files,
-      :asset_paths
+      :asset_paths,
+      :compass_dir
 
 
     def self.configure(&block) 
       @@instance = HighFive::Config.new
       yield @@instance
+
+      if @@instance.root.nil?
+        raise "HighFive::Config.root is required"
+      end
     end
 
     def self.load
       begin
-        require File.join(HighFive::ROOT, "config", "high_five.rb")
+        require File.join(Dir.pwd, "config", "high_five.rb")
       rescue LoadError
         raise "high_five configuration not found, forgot to run 'hi5 init'?"
       end
@@ -41,6 +46,7 @@ module HighFive
         new_config.static_stylesheets += self.static_stylesheets
         new_config.sass_files += self.sass_files
         new_config.asset_paths += self.asset_paths
+        new_config.compass_dir ||= self.compass_dir
         return new_config
       else
         return self

data/lib/high_five/deploy_task.rb

@@ -33,46 +33,34 @@ module HighFive
           say " -Weinre url: #{@weinre_url}" if @weinre_url
 
 
-          #todo customize this
-          # Dir.chdir File.join("assets", "sass")
-          # success = false
-          # if @environment == "production"
-          #   success = system("compass compile --force --no-debug-info -e production #{options[:platform]}.scss")
-          # else
-          #   success = system("compass compile --force --no-debug-info #{options[:platform]}.scss")
-          # end
-          # unless success
-          #   raise "Error compiling CSS, aborting build"
-          # end
-          # Dir.chdir pwd
-
-          # Build javascript
-          # inside "assets" do |assets|
-          #   directory "images"
-          #   directory "stylesheets"
-          #   inside "javascripts" do |dir|
-          #     if @compress == true
-          #       build_javascript :from => "app-#{@platform}", :to => 'app-all.js'
-          #       compress_javascript "app-all.js"
-          #     else      
-          #       bundle = builder.find_asset "app-#{@platform}"
-          #       @js_files = bundle.dependencies.map {|asset| File.join("assets",  asset.logical_path) }
-          #       copy_file "app.js"
-          #       directory "app"
-          #       directory "config"
-          #       directory "lib"
-          #       directory "platform/phonegap" unless @platform == 'web'
-          #       directory "platform/#{@platform}"
-          #     end
-
-          #   end
+          
+          if @config.compass_dir
+            compass_dir = File.join(base_config.root, @config.compass_dir)
+            pwd = Dir.pwd
+            Dir.chdir compass_dir
+            # TODO make this invoke compass programatically
+            # Consider using sprockets for css too, although I kindof hate that
+            say "Precompiling compass styles from #{compass_dir}}"
+            success = false
+            if @environment == "production"
+              success = system("compass compile --force --no-debug-info -e production")
+            else
+              success = system("compass compile --force --no-debug-info")
+            end
+            unless success
+              raise "Error compiling CSS, aborting build"
+            end
+            Dir.chdir pwd
+          end
 
           # Bundle is based on the provided build platformx
           platform_file = File.join(@config_root, "app-#{@platform}.js")
-          unless File.exists? platform_file
-            error "#{@platform} is not a valid target.  Please create app-#{@platform}.js" and exit
-          end
           bundle = builder.find_asset platform_file
+          if bundle.nil?
+            p source_paths
+            error "#{@platform} is not a valid target.  Please create #{platform_file}" and Process.exit
+          end
+          
 
           if (@environment == "production")
             appjs = File.join(self.destination_root, "app.js")
@@ -81,7 +69,8 @@ module HighFive
             bundle.write_to(appjs)
           else
             # Add each of the javascript files to the generated folder
-            @javascripts = bundle.dependencies.map do |asset| 
+            @javascripts = bundle.dependencies.map do |asset|
+              next if asset.logical_path =~ /^config\/high_five/ #don't copy manifest files
               copy_file asset.logical_path
               asset.logical_path
             end
@@ -104,7 +93,8 @@ module HighFive
             css_file = File.join(self.destination_root, "stylesheets", "#{asset_name}.css")
             say "Compiling #{sass_file} -> #{css_file}"
             Sass.compile_file sass_file, css_file
-            @stylesheets.push sass_file
+            @stylesheets.push css_file
+            copy_file css_file
           end
 
           @config.static_stylesheets.each do |stylesheet|
@@ -126,31 +116,9 @@ module HighFive
             end
           end
 
-          #   inside "stylesheets" do |dir|
-          #     # Copy generated css
-          #     copy_file "#{@platform}.css", "theme.css"
-          #   end
-          # end
-            
           # Build index.html
           say "Generating index.html"
           template File.join(@config_root, "index.html.erb"), File.join(self.destination_root, "index.html")
-
-          # if (@copy_files) 
-          #   dest = nil
-          #   # copy to platform build directories
-          #   if (@platform == 'android')
-          #     dest = File.join(HighFive::ROOT, "..", "account_assistant-android/assets/www")
-          #   elsif (@platform == 'ios') 
-          #     dest = File.join(HighFive::ROOT, "..", "account_assistant-ios/www")
-          #   end
-
-          #   if (!dest.nil? && File.exists?(dest))
-          #     say "Copying to #{@platform} native project: #{dest}"
-          #     FileUtils.rm_rf(dest)
-          #     directory self.destination_root, dest
-          #   end
-          # end
         end
       
         private 
@@ -160,16 +128,14 @@ module HighFive
         end
 
         def get_builder
-          builder = Sprockets::Environment.new(File.join(HighFive::ROOT))
-          builder.append_path "."
+          builder = Sprockets::Environment.new(File.join(base_config.root))
           builder.append_path base_config.root
           builder.append_path File.join(base_config.root, @config_root)
           @config.asset_paths.each do |path|
             full_path = File.join(base_config.root, path)
-            puts "adding path #{full_path}"
+            say "adding asset search path #{full_path}"
             builder.append_path full_path
           end
-
           builder
         end
 

data/lib/high_five/init_task.rb

@@ -6,7 +6,8 @@ module HighFive
 
         desc "init", "Initialize the high_five configuration in the current working directory"
         def init
-          self.destination_root = HighFive::ROOT
+          self.destination_root = Dir.pwd
+          self.source_paths << HighFive::TEMPLATE_PATH
 
           inside "config" do
             template("high_five.rb")

data/lib/high_five/version.rb

@@ -1,3 +1,3 @@
 module HighFive
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
 end

data/spec/config_spec.rb

@@ -5,6 +5,7 @@ describe HighFive::Config do
   context "asset_paths" do
     before do 
       HighFive::Config.configure do |config|
+        config.root = "/"
         config.asset_paths = ["assets"]
         config.platform :android do |android|
 
@@ -15,10 +16,7 @@ describe HighFive::Config do
     it "should keep track of asset_paths for platform configs" do 
       platform_config = @config.build_platform_config('android')
       platform_config.asset_paths.should eq ["assets"]
-
-
     end
-
   end
 
 end

data/spec/deploy_spec.rb

@@ -1,6 +1,79 @@
 require 'spec_helper'
 
 describe HighFive::DeployTask do 
+  def create_dummy_app!
+    @original_dir = Dir.pwd
+    @project_root = Dir.mktmpdir("hi5")
+    Dir.chdir @project_root
+    FileUtils.cp_r(Dir[File.join(File.dirname(__FILE__), "dummy", "*")], @project_root)
+  end
 
+  def cli
+    cli = HighFive::Cli.new
+    cli.instance_variable_set("@base_config", HighFive::Config.instance)
+    cli
+  end
 
-  end
+  def destroy_dummy_app!
+    puts "Cleaning up deploy directory.  Contents: "
+    system("find #{@project_root} -print | sed 's;[^/]*/;|___;g;s;___|; |;g'")
+    Dir.chdir @original_dir
+    FileUtils.rm_rf @project_root
+  end
+    
+  context "Basic Deployment" do
+    before :all do  
+      create_dummy_app!
+      HighFive::Config.configure do |config|
+        config.root = @project_root
+        config.destination = "www"
+        config.platform :android do |android|
+        
+        end
+
+        cli.deploy("android")
+      end
+    end
+
+    after(:all) { destroy_dummy_app! }
+
+    it "should deploy" do
+      Dir.exists?(File.join(@project_root, "www")).should be_true
+    end
+
+    it "should copy all the javascript files" do
+      File.join(@project_root, "www", "javascripts", "app").should exist
+      File.join(@project_root, "www", "javascripts", "app", "component.js").should exist
+    end
+  end
+
+  context "SASS Deployment" 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 :android do |android|
+        
+        end
+
+        cli.deploy("android")
+      end
+    end
+
+    after(:all) { destroy_dummy_app! }
+
+    it "should invoke compass to compile stylesheets" do 
+      expect(File.join(@project_root, "stylesheets", "screen.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
+
+end

data/spec/dummy/config/high_five/app-android.js

@@ -0,0 +1,2 @@
+// This file can be used to customize the javascript includes for a sepcific platform
+//= require app-common

data/spec/dummy/config/high_five/app-common.js

@@ -0,0 +1,4 @@
+//This is where you define the javascripts you include and their include order for your app.
+//Only include app code that you want minified here, add library or remote scripts to config/high_five.rb
+//= require javascripts/app.js
+//= require_tree ../../javascripts/app

data/spec/dummy/config/high_five/app-ios.js

@@ -0,0 +1,2 @@
+// This file can be used to customize the javascript includes for a sepcific platform
+//= require app-common

data/spec/dummy/config/high_five/index.html.erb

@@ -0,0 +1,26 @@
+<!doctype html>
+<html lang="en">
+    <head>
+        <meta charset="utf-8">
+        <title><%= @meta[:title] %></title>
+        <meta name="description" content="<%= @meta[:description] %>" />
+        <% @stylesheets.each do |ss| -%>
+            <link rel="stylesheet" href="<%= ss %>" type="text/css" />
+        <% end -%>
+        <% if @platform != 'web' -%>
+            <% if @environment == 'development' -%>
+                <script type="text/javascript">
+                    window.onerror = function(e,u,l) {
+                      alert("Error caught" + e + " " + u + ":" + l);
+                    };
+                </script>
+            <% end -%>
+        <% end -%>
+        <%- @javascripts.each do |js| -%>
+            <script type="text/javascript" src="<%= js %>"></script>
+        <%- end -%>	
+
+    </head>
+    <body></body>
+</html>
+

data/spec/dummy/config/high_five.rb

@@ -0,0 +1,3 @@
+#This isn't used, the tests stub this out to test specific configuration options
+HighFive::Config.configure do |config|
+end

data/spec/dummy/config.rb

@@ -0,0 +1,24 @@
+# Require any additional compass plugins here.
+
+# Set this to the root of your project when deployed:
+http_path = "/"
+css_dir = "stylesheets"
+sass_dir = "sass"
+images_dir = "images"
+javascripts_dir = "javascripts"
+
+# You can select your preferred output style here (can be overridden via the command line):
+# output_style = :expanded or :nested or :compact or :compressed
+
+# To enable relative paths to assets via compass helper functions. Uncomment:
+# relative_assets = true
+
+# To disable debugging comments that display the original location of your selectors. Uncomment:
+# line_comments = false
+
+
+# If you prefer the indented syntax, you might want to regenerate this
+# project again passing --syntax sass, or you can uncomment this:
+# preferred_syntax = :sass
+# and then run:
+# sass-convert -R --from scss --to sass sass scss && rm -rf sass && mv scss sass

data/spec/dummy/javascripts/app/component.js

@@ -0,0 +1,3 @@
+var Component = {
+    field: "component_was_included"
+};

data/spec/dummy/javascripts/app.js

@@ -0,0 +1 @@
+alert("This application is awesome!");

data/spec/dummy/sass/ie.scss

@@ -0,0 +1,5 @@
+/* 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

@@ -0,0 +1,3 @@
+/* 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/sass/screen.scss

@@ -0,0 +1,9 @@
+/* Welcome to Compass.
+ * In this file you should write your main styles. (or centralize your imports)
+ * Import this file using the following HTML or equivalent:
+ * <link href="/stylesheets/screen.css" media="screen, projection" rel="stylesheet" type="text/css" /> */
+
+@import "compass/reset";
+.testClass {
+  background: red;
+}

data/spec/dummy/stylesheets/ie.css

@@ -0,0 +1,5 @@
+/* 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

@@ -0,0 +1,3 @@
+/* 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/screen.css

@@ -0,0 +1,68 @@
+/* Welcome to Compass.
+ * In this file you should write your main styles. (or centralize your imports)
+ * Import this file using the following HTML or equivalent:
+ * <link href="/stylesheets/screen.css" media="screen, projection" rel="stylesheet" type="text/css" /> */
+/* line 17, ../../../../.rvm/gems/ruby-1.9.3-p392@high_five/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
+html, body, div, span, applet, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+a, abbr, acronym, address, big, cite, code,
+del, dfn, em, img, ins, kbd, q, s, samp,
+small, strike, strong, sub, sup, tt, var,
+b, u, i, center,
+dl, dt, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td,
+article, aside, canvas, details, embed,
+figure, figcaption, footer, header, hgroup,
+menu, nav, output, ruby, section, summary,
+time, mark, audio, video {
+  margin: 0;
+  padding: 0;
+  border: 0;
+  font: inherit;
+  font-size: 100%;
+  vertical-align: baseline;
+}
+
+/* line 22, ../../../../.rvm/gems/ruby-1.9.3-p392@high_five/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
+html {
+  line-height: 1;
+}
+
+/* line 24, ../../../../.rvm/gems/ruby-1.9.3-p392@high_five/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
+ol, ul {
+  list-style: none;
+}
+
+/* line 26, ../../../../.rvm/gems/ruby-1.9.3-p392@high_five/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
+table {
+  border-collapse: collapse;
+  border-spacing: 0;
+}
+
+/* line 28, ../../../../.rvm/gems/ruby-1.9.3-p392@high_five/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
+caption, th, td {
+  text-align: left;
+  font-weight: normal;
+  vertical-align: middle;
+}
+
+/* line 30, ../../../../.rvm/gems/ruby-1.9.3-p392@high_five/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
+q, blockquote {
+  quotes: none;
+}
+/* line 103, ../../../../.rvm/gems/ruby-1.9.3-p392@high_five/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
+q:before, q:after, blockquote:before, blockquote:after {
+  content: "";
+  content: none;
+}
+
+/* line 32, ../../../../.rvm/gems/ruby-1.9.3-p392@high_five/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
+a img {
+  border: none;
+}
+
+/* line 116, ../../../../.rvm/gems/ruby-1.9.3-p392@high_five/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
+article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section, summary {
+  display: block;
+}

data/spec/init_spec.rb

@@ -7,7 +7,6 @@ describe "InitTask" do
     @original_dir = Dir.pwd
     @project_root = Dir.mktmpdir("hi5")
     Dir.chdir @project_root
-    HighFive::ROOT = @project_root
   end
 
   after :each do

data/spec/spec_helper.rb

@@ -6,6 +6,7 @@ require 'high_five/cli'
 # loaded once.
 #
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
@@ -17,3 +18,9 @@ RSpec.configure do |config|
   #     --seed 1234
   config.order = 'random'
 end
+
+RSpec::Matchers.define :exist do
+  match do |actual|
+    File.exists?(actual)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: high_five
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -121,6 +121,20 @@ files:
 - lib/high_five/version.rb
 - spec/config_spec.rb
 - spec/deploy_spec.rb
+- spec/dummy/config.rb
+- spec/dummy/config/high_five.rb
+- spec/dummy/config/high_five/app-android.js
+- spec/dummy/config/high_five/app-common.js
+- spec/dummy/config/high_five/app-ios.js
+- 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/stylesheets/screen.css
 - spec/init_spec.rb
 - spec/spec_helper.rb
 - template/config/high_five.rb
@@ -155,5 +169,19 @@ summary: HighFive is a set of build scripts and tools for packing HTML5 apps bot
 test_files:
 - spec/config_spec.rb
 - spec/deploy_spec.rb
+- spec/dummy/config.rb
+- spec/dummy/config/high_five.rb
+- spec/dummy/config/high_five/app-android.js
+- spec/dummy/config/high_five/app-common.js
+- spec/dummy/config/high_five/app-ios.js
+- 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/stylesheets/screen.css
 - spec/init_spec.rb
 - spec/spec_helper.rb