high_five 0.0.2 → 0.0.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    high_five (0.0.1)
+    high_five (0.0.3)
       compass (~> 0.12.2)
       sprockets (~> 2.9.0)
       thor (~> 0.17.0)

data/bin/hi5

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

data/lib/high_five/android_tasks.rb

@@ -0,0 +1,17 @@
+module HighFive
+  module AndroidTasks
+    def self.included(mod)
+      mod.class_eval do 
+
+        namespace "android"
+        desc "android_debug", "build the debug apk via ant debug"
+        def android_debug
+          self.destination_root = HighFive::ROOT
+          puts "Debugy"
+        end
+
+
+      end #end class_eval
+    end
+  end
+end

data/lib/high_five/cli.rb

@@ -1,36 +1,28 @@
 require 'thor'
 require 'high_five/deploy_task'
 require 'high_five/init_task'
+require 'high_five/android_tasks'
 require 'high_five/config'
 
 module HighFive
   class Cli < Thor
     include Thor::Actions
-    include HighFive::DeployTask
     include HighFive::InitTask
-
+    include HighFive::DeployTask
+    include HighFive::AndroidTasks
     # source root path for Thor::Actions commands
-    source_root(HighFive::TEMPLATE_PATH)
-
-    desc "deploy", "Deploy the app for a specific platform in a specific environment"
-    method_option :environment, :aliases => "-e", :desc => "Environemnt [production|development]", :default => "development"
-    method_option :compress, :aliases => '-c', :desc => "Compress javascript [true]", :default => false
-    method_option :weinre_url, :aliases => '-w', :desc => "Enter your Weinre server-url including port", :default => false
-    method_option :"copy-files", :aliases => '-f', :desc => "Copy files to eclipse/xcode directory", :default => false
-    def deploy(target)
-      self.source_paths << File.join(base_config.root)
-      deploy_task(target)
-    end
-
-    desc "init", "Initialize the high_five configuration in the current working directory"
-    def init
-      init_task
-    end
+    source_root(HighFive::ROOT)
 
+    class_option :version, type: :boolean, desc: "Print version and ext", aliases: "-v"
     def initialize(*args)
-      super(*args)
+      super
+      
+      if options[:version]
+        puts "HighFive #{HighFive::VERSION}" 
+        Process.exit(0)
+      end
     end
-
+   
     private
     def base_config
       begin 
@@ -41,4 +33,4 @@ module HighFive
       end
     end
   end
-end
+end

data/lib/high_five/config.rb

@@ -7,7 +7,8 @@ module HighFive
       :static_assets,
       :static_javascripts,
       :static_stylesheets,
-      :sass_files
+      :sass_files,
+      :asset_paths
 
 
     def self.configure(&block) 
@@ -24,6 +25,10 @@ module HighFive
       return @@instance 
     end
 
+    def self.instance
+      @@instance
+    end
+
     def build_platform_config(platform)
       if @platform_configs[platform.to_s]
         new_config = HighFive::Config.new(@platform_configs[platform.to_s])
@@ -35,6 +40,7 @@ module HighFive
         new_config.static_javascripts += self.static_javascripts
         new_config.static_stylesheets += self.static_stylesheets
         new_config.sass_files += self.sass_files
+        new_config.asset_paths += self.asset_paths
         return new_config
       else
         return self
@@ -48,6 +54,7 @@ module HighFive
         @static_stylesheets = config.static_stylesheets.dup
         @sass_files = config.sass_files.dup
         @meta = config.meta.dup
+        @asset_paths = config.asset_paths.dup
         self.root = config.root
         self.destination = config.destination
         self.page_title = config.page_title
@@ -59,6 +66,7 @@ module HighFive
         @sass_files = []
         @meta = {}
         @platform_configs = {}
+        @asset_paths = []
       end
     end 
 

data/lib/high_five/deploy_task.rb

@@ -3,181 +3,197 @@ require 'sass'
 module HighFive
   module DeployTask 
 
-    def deploy_task(target)
-      @environment  = options[:environment]
-      @platform     = target
-      @weinre_url   = options[:weinre_url]
-      @copy_files   = options[:"copy-files"]
-      @meta         = {}
-      config = base_config.build_platform_config(@platform)
-      @config_root = File.join("config", "high_five")
-
-      self.source_paths << File.join(base_config.root, @config_root)
-
-      raise "Please set config.destination" if config.destination.nil?
-      self.destination_root = config.destination
-      FileUtils.rm_rf(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
-
-
-      #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
-
-      # 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"
-      end
-      bundle = builder.find_asset platform_file
-
-      if (@environment == "production")
-        appjs = File.join(self.destination_root, "app.js")
-        @javascripts = ["app.js"]
-        say "      create  #{appjs}", :green
-        bundle.write_to(appjs)
-      else
-        # Add each of the javascript files to the generated folder
-        @javascripts = bundle.dependencies.map do |asset| 
-          copy_file asset.logical_path
-          asset.logical_path
+    def self.included(mod) 
+      mod.class_eval do 
+
+        desc "deploy", "Deploy the app for a specific platform in a specific environment"
+        method_option :environment, :aliases => "-e", :desc => "Environemnt [production|development]", :default => "development"
+        method_option :compress, :aliases => '-c', :desc => "Compress javascript [true]", :default => false
+        method_option :weinre_url, :aliases => '-w', :desc => "Enter your Weinre server-url including port", :default => false
+        method_option :"copy-files", :aliases => '-f', :desc => "Copy files to eclipse/xcode directory", :default => false
+        def deploy(target)
+          @environment  = options[:environment]
+          @platform     = target
+          @weinre_url   = options[:weinre_url]
+          @copy_files   = options[:"copy-files"]
+          @meta         = {}
+          @config       = base_config.build_platform_config(@platform)
+          @config_root  = File.join("config", "high_five")
+          
+          self.source_paths << File.join(base_config.root, @config_root)
+          self.source_paths << File.join(base_config.root)
+
+          raise "Please set config.destination" if @config.destination.nil?
+          self.destination_root = @config.destination
+          FileUtils.rm_rf(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
+
+
+          #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
+
+          # 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 (@environment == "production")
+            appjs = File.join(self.destination_root, "app.js")
+            @javascripts = ["app.js"]
+            say "      create  #{appjs}", :green
+            bundle.write_to(appjs)
+          else
+            # Add each of the javascript files to the generated folder
+            @javascripts = bundle.dependencies.map do |asset| 
+              copy_file asset.logical_path
+              asset.logical_path
+            end
+          end
+
+          # Adds each of the static javascripts
+          @config.static_javascripts.each do |javascript|
+            if File.directory? javascript
+              directory javascript
+              @javascripts.unshift(*Dir[File.join(javascript,'**','*.js')])
+            else
+              copy_file javascript unless javascript =~ /^https?:\/\// 
+              @javascripts.unshift javascript
+            end
+          end
+
+          @stylesheets = []
+          @config.sass_files.each do |sass_file|
+            asset_name = File.basename(sass_file, File.extname(sass_file)) 
+            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
+          end
+
+          @config.static_stylesheets.each do |stylesheet|
+            if File.directory? stylesheet
+              directory stylesheet
+              @stylesheets.unshift(*Dir[File.join(stylesheet,'**','*.css')])
+            else
+              copy_file stylesheet
+              @stylesheets.unshift stylesheet
+            end
+          end
+
+          # Adds each of the static assets to the generated folder (sylesheets etc)
+          @config.static_assets.each do |asset|
+            if File.directory? asset
+              directory asset
+            else
+              copy_file asset
+            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
-      end
+      
+        private 
 
-      # Adds each of the static javascripts
-      config.static_javascripts.each do |javascript|
-        if File.directory? javascript
-          directory javascript
-          @javascripts.unshift(*Dir[File.join(javascript,'**','*.js')])
-        else
-          copy_file javascript unless javascript =~ /^https?:\/\// 
-          @javascripts.unshift javascript
+        def builder
+          @builder ||= get_builder
         end
-      end
-
-      @stylesheets = []
-      config.sass_files.each do |sass_file|
-        asset_name = File.basename(sass_file, File.extname(sass_file)) 
-        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
-      end
 
-      config.static_stylesheets.each do |stylesheet|
-        if File.directory? stylesheet
-          directory stylesheet
-          @stylesheets.unshift(*Dir[File.join(stylesheet,'**','*.css')])
-        else
-          copy_file stylesheet
-          @stylesheets.unshift stylesheet
+        def get_builder
+          builder = Sprockets::Environment.new(File.join(HighFive::ROOT))
+          builder.append_path "."
+          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}"
+            builder.append_path full_path
+          end
+
+          builder
         end
-      end
 
-      # Adds each of the static assets to the generated folder (sylesheets etc)
-      config.static_assets.each do |asset|
-        if File.directory? asset
-          directory asset
-        else
-          copy_file asset
+        #TODO: this probably doesn't work on windows 
+        def compress_javascript(file_name)
+          say " -Compressing #{file_name} with yuicompressor", :yellow
+
+          compressor = 'yuicompressor'
+          if `which yuicompressor`.empty?
+            compressor = 'yui-compressor'
+            if `which yui-compressor`.empty?
+              say "ERROR: you don't have a yuicompressor installed", :red
+              say " Are you sure yuicompressor is installed on your system?  Mac users, run this in console:", :red
+              say " $ brew install yuicompressor", :red
+              say " Ubuntu users: $sudo apt-get -y install yui-compressor", :red
+            end
+          end
+          cmd = "#{compressor} #{file_name} -o #{file_name}"
+          system(cmd)
+          unless $?.exitstatus == 0
+            say " ERROR: #{cmd}", :red
+          end
         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 
-
-    def builder
-      @builder ||= get_builder
-    end
-
-    def get_builder
-      builder = Sprockets::Environment.new(File.join(HighFive::ROOT))
-      builder.append_path @config_root
-      builder.append_path "."
-      builder.append_path base_config.root
-
-      builder
-    end
-
-    #TODO: this probably doesn't work on windows 
-    def compress_javascript(file_name)
-      say " -Compressing #{file_name} with yuicompressor", :yellow
-
-      compressor = 'yuicompressor'
-      if `which yuicompressor`.empty?
-        compressor = 'yui-compressor'
-        if `which yui-compressor`.empty?
-          say "ERROR: you don't have a yuicompressor installed", :red
-          say " Are you sure yuicompressor is installed on your system?  Mac users, run this in console:", :red
-          say " $ brew install yuicompressor", :red
-          say " Ubuntu users: $sudo apt-get -y install yui-compressor", :red
-        end
-      end
-      cmd = "#{compressor} #{file_name} -o #{file_name}"
-      system(cmd)
-      unless $?.exitstatus == 0
-        say " ERROR: #{cmd}", :red
-      end
     end
   end
 end

data/lib/high_five/init_task.rb

@@ -1,23 +1,30 @@
 require 'fileutils'
 module HighFive
   module InitTask
+    def self.included(mod) 
+      mod.class_eval do
 
-    def init_task
-      self.destination_root = HighFive::ROOT
+        desc "init", "Initialize the high_five configuration in the current working directory"
+        def init
+          self.destination_root = HighFive::ROOT
 
-      inside "config" do
-        template("high_five.rb")
-        inside "high_five" do
-          copy_file "index.html.erb", :skip => true
-          copy_file "app-common.js", :skip => true
+          inside "config" do
+            template("high_five.rb")
+            inside "high_five" do
+              copy_file "index.html.erb", :skip => true
+              copy_file "app-common.js", :skip => true
 
-          #TODO make this a CLI argument
-          platforms = ["android", "ios"]
-          platforms.each do |platform|
-            copy_file "app-platform.js", "app-#{platform}.js", :skip => true
+              #TODO make this a CLI argument
+              platforms = ["android", "ios"]
+              platforms.each do |platform|
+                copy_file "app-platform.js", "app-#{platform}.js", :skip => true
+              end
+            end
           end
         end
-      end
+
+
+      end #end class_eval
     end
   end
 end

data/lib/high_five/version.rb

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

data/spec/config_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+describe HighFive::Config do 
+
+  context "asset_paths" do
+    before do 
+      HighFive::Config.configure do |config|
+        config.asset_paths = ["assets"]
+        config.platform :android do |android|
+
+        end
+      end
+      @config = HighFive::Config.instance
+    end
+    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

@@ -0,0 +1,6 @@
+require 'spec_helper'
+
+describe HighFive::DeployTask do 
+
+
+  end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: high_five
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-02 00:00:00.000000000 Z
+date: 2013-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -113,11 +113,14 @@ files:
 - high_five.gemspec
 - lib/.DS_Store
 - lib/high_five.rb
+- lib/high_five/android_tasks.rb
 - lib/high_five/cli.rb
 - lib/high_five/config.rb
 - lib/high_five/deploy_task.rb
 - lib/high_five/init_task.rb
 - lib/high_five/version.rb
+- spec/config_spec.rb
+- spec/deploy_spec.rb
 - spec/init_spec.rb
 - spec/spec_helper.rb
 - template/config/high_five.rb
@@ -150,5 +153,7 @@ specification_version: 3
 summary: HighFive is a set of build scripts and tools for packing HTML5 apps both
   for the web and for phonegap
 test_files:
+- spec/config_spec.rb
+- spec/deploy_spec.rb
 - spec/init_spec.rb
 - spec/spec_helper.rb