high_five 0.2.10 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a85647c3f316bd2db943064214e638ff9cbf1678
-  data.tar.gz: 1b045e34a73ee5e8a763beeb7c66545865da1c7d
+  metadata.gz: 27ccf2067d4538c720d326fb96971e01c2e2dd0d
+  data.tar.gz: 8523d2acf0203aaa308a1f05334f2d578411353a
 SHA512:
-  metadata.gz: 7c300755b30b130c55dc25d8b2671b740a8b49fd01f103fd57f81fae9655cf32e7e257fe5acadd1ade4fcc617e499764b4c4e549e3d77600cb8d875bf6fc8dfe
-  data.tar.gz: 268ec45df905db5523bb5a8bacb4f1c751d8f2abda0932712b47dc288764b53a32393f8f328ff089a26d731848723e0a2b55554968ea94a6fa6edfec917806d1
+  metadata.gz: 57b2164752c7f2268ee5370526875b33365310e1fdfe6187308ba3697e2bebb268b287a38386f4037a88a5c44c733f446b5d873749bb158df7a81cbe0465f03d
+  data.tar.gz: dbedf9c1f5a827372a84f83c94bc2567f50db5c3970eaa34614f972998834728b7d7e6a37bfc8e2eb658515e7508abfd94f89deaa490efdbed53348b6b4c04ae

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    high_five (0.2.9)
+    high_five (0.3.0)
       chunky_png
       coffee-script (~> 2.2.0)
       compass (~> 0.12.2)
@@ -9,7 +9,7 @@ PATH
       nokogiri (>= 1.5.0)
       plist (>= 3.0)
       sprockets (>= 2.0)
-      thor (~> 0.17.0)
+      thor (~> 0.18.0)
       uglifier (~> 2.1.1)
       webrick
       yui-compressor (~> 0.9.6)
@@ -22,24 +22,30 @@ GEM
       open4
     Platform (0.4.0)
     chunky_png (1.3.1)
+    coderay (1.1.0)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.7.1)
+    coffee-script-source (1.8.0)
     compass (0.12.7)
       chunky_png (~> 1.2)
       fssm (>= 0.2.7)
       sass (~> 3.2.19)
     diff-lcs (1.2.5)
-    execjs (2.2.1)
+    execjs (2.2.2)
     fssm (0.2.10)
     hike (1.2.3)
+    method_source (0.8.2)
     mini_portile (0.6.0)
     multi_json (1.10.1)
     nokogiri (1.6.3.1)
       mini_portile (= 0.6.0)
     open4 (1.3.4)
     plist (3.1.0)
+    pry (0.10.1)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
     rack (1.5.2)
     rspec (2.13.0)
       rspec-core (~> 2.13.0)
@@ -50,12 +56,13 @@ GEM
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.13.1)
     sass (3.2.19)
-    sprockets (2.12.1)
+    slop (3.6.0)
+    sprockets (2.12.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    thor (0.17.0)
+    thor (0.18.1)
     tilt (1.4.1)
     uglifier (2.1.2)
       execjs (>= 0.3.0)
@@ -69,4 +76,5 @@ PLATFORMS
 
 DEPENDENCIES
   high_five!
+  pry
   rspec (~> 2.13.0)

data/bin/hi5

@@ -1,20 +1,10 @@
 #!/usr/bin/env ruby
-# resolve bin path, ignoring symlinks
 require 'high_five'
 require 'high_five/thor/runner'
 bin_file = Pathname.new(__FILE__).realpath
-
 # add self to libpath
 $:.unshift File.expand_path("../../lib", bin_file)
 
-# begin
-#   require 'high_five'
-# rescue LoadError
-#   require 'rubygems'
-#   require 'high_five'
-# end
-# require 'high_five/cli'
-
 $thor_runner = true
 $high_five_runner = true
 ::HighFive::Thor::Runner.start

data/high_five.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   }
 
   s.add_dependency 'multi_json', '~> 1.0'
-  s.add_runtime_dependency "thor", "~>0.17.0"
+  s.add_runtime_dependency "thor", "~>0.18.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"
@@ -27,6 +27,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "chunky_png"
   s.add_runtime_dependency "webrick"
   s.add_development_dependency "rspec", "~>2.13.0"
+  s.add_development_dependency "pry"
 
 
   s.files         = `git ls-files`.split("\n")

data/lib/high_five/config.rb

@@ -19,9 +19,9 @@ module HighFive
       config_variables = []
       settings.each do |setting|
         attr_accessor setting
+        var = "@#{setting}".to_sym
+        config_variables << var
         define_method setting do |*args|
-          var = "@#{setting}".to_sym
-          config_variables << var
           instance_variable_set(var, args[0]) if args.length == 1
           instance_variable_get(var)
         end

data/lib/high_five/thor/runner.rb

@@ -2,14 +2,14 @@ require "thor/runner"
 require 'high_five/thor/task'
 require 'high_five/thor/tasks'
 
+
 module HighFive
   module Thor
     class Runner < ::Thor::Runner
-
       #this works but I hate it
-      register(HighFive::Thor::Tasks::Distribution, "dist", "dist [PLATFORM]", "Shortcut to distribution:dist")
+      register(HighFive::Thor::Tasks::Dist, "dist", "dist [PLATFORM]", "Shortcut to distribution:dist")
       register(HighFive::Thor::Tasks::Deploy, "deploy", "deploy [PLATFORM]", "Shortcut to deploy:deploy")
-      register(HighFive::Thor::Tasks::Initialization, "init", "init", "Shortcut to Initialization:init")
+      register(HighFive::Thor::Tasks::Init, "init", "init", "Shortcut to Initialization:init")
 
       # Note: because of the way task.run works, there has to be a local
       # definition. Also, we want tasks to work WITH our base namespace
@@ -17,21 +17,15 @@ module HighFive
       # signature we would use thor
       def method_missing(meth, *args)
         meth = meth.to_s
-        #meth.sub!(/^high_five:/, '')
-        if (!meth.match(/:/))
-          meth = "high_five:#{meth}"
-        end
+        meth.sub!(/^high_five:/, '')
+        # if (!meth.match(/:/))
+        #   meth = "high_five:#{meth}"
+        # end
         super meth, *args
       end
 
-      class_option :version, type: :boolean, desc: "Print version and ext", aliases: "-v"
-      def initialize(*args)
-        super
-        #override version task
-        if args[2][:current_task][:name] == "version"
-          puts "HighFive #{HighFive::VERSION}" 
-          Process.exit(0)
-        end
+      def version
+        say "High Five v#{HighFive::VERSION}"
       end
 
       private

data/lib/high_five/thor/task.rb

@@ -3,13 +3,20 @@ require 'high_five/config'
 module HighFive
   module Thor
     class Task < ::Thor
-      def self.banner(task, namespace = false, subcommand = true)
-        if self.namespace == "high_five"
-          ns = ""
-        else
-          ns = "#{self.namespace}:"
+      # def self.banner(task, namespace = false, subcommand = true)
+      #   if self.namespace == "high_five"
+      #     ns = ""
+      #   else
+      #     ns = "#{self.namespace}:"
+      #   end
+      #   "hi5 #{ns}" + task.formatted_usage(self, namespace, subcommand)
+      # end
+
+
+      class << self
+        def inherited(base) #:nodoc:
+          base.send :extend,  ClassMethods
         end
-        "hi5 #{ns}" + task.formatted_usage(self, namespace, subcommand)
       end
 
       no_tasks {
@@ -17,15 +24,9 @@ module HighFive
           name.sub!(/^high_five:/, '') if name && $high_five_runner
           super
         end
-        
-        class << self
-          def inherited(base) #:nodoc:
-            base.send :extend,  ClassMethods
-          end
-        end
 
         def base_config
-          begin 
+          begin
             @base_config ||= HighFive::Config.load
           rescue StandardError => e
             raise e
@@ -35,11 +36,6 @@ module HighFive
         end
       }
 
-      def initialize(*args)
-        super
-       
-      end
-    
       module ClassMethods
         def namespace(name=nil)
           case name
@@ -47,13 +43,13 @@ module HighFive
             constant = self.to_s.gsub(/^Thor::Sandbox::/, "")
             strip = $high_five_runner ? /^HighFive::Thor::Tasks::/ : /(?<=HighFive::)Thor::Tasks::/
             constant = constant.gsub(strip, "")
-            constant =  ::Thor::Util.snake_case(constant).squeeze(":")          
+            constant =  ::Thor::Util.snake_case(constant).squeeze(":")
             @namespace ||= constant
           else
             super
           end
         end
       end
-    end  
+    end
   end
 end

data/lib/high_five/thor/tasks/{android_tasks.rb → android.rb}

@@ -5,11 +5,10 @@ require 'nokogiri'
 module HighFive
   module Thor
     module Tasks
-      class AndroidTasks < ::HighFive::Thor::Task
+      class Android < ::HighFive::Thor::Task
         include ::Thor::Actions
-        include HighFive::AndroidHelper
+        include ::HighFive::AndroidHelper
         include ::HighFive::ImageHelper
-        namespace :android
 
         desc "debug", "build the debug apk via ant debug"
         def debug(target)

data/lib/high_five/thor/tasks/deploy.rb

@@ -23,7 +23,7 @@ module HighFive
           @meta         = {}
           @config       = base_config.build_platform_config(@platform).build_platform_config(@environment)
           @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)
           self.source_paths << File.join(File.dirname(__FILE__), '..', '..', 'generators')
@@ -41,7 +41,8 @@ module HighFive
           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)
             say "Precompiling compass styles from #{compass_dir}}"
@@ -66,12 +67,12 @@ module HighFive
             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")
             @javascripts = ["app.js"]
-            
+
             output_js = nil
             if @config.minify  == :uglifier
               say "      uglify  #{appjs}", :green
@@ -83,7 +84,7 @@ module HighFive
               say "      create  #{appjs}", :green
               output_js = bundle.to_s
             end
-            File.open(appjs, "w") do |file| 
+            File.open(appjs, "w") do |file|
               file.write output_js
             end
             output_js = nil
@@ -103,14 +104,14 @@ module HighFive
               directory javascript
               @javascripts.unshift(*Dir[File.join(javascript,'**','*.js')])
             else
-              copy_file javascript unless javascript =~ /^https?:\/\// 
+              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)) 
+            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
@@ -131,12 +132,10 @@ module HighFive
           # Adds each of the static assets to the generated folder (sylesheets etc)
           @config.static_assets.each do |path, options|
             asset = find_in_source_paths(path)
-            destination = path 
+            destination = path
             if (options[:destination])
               destination = File.join(self.destination_root, options[:destination])
-              puts "OVERRIDING with #{options[:destination]}"
             end
-            puts "DESTINATION: #{destination}"
             if File.directory? asset
               directory asset, destination
             else
@@ -171,8 +170,8 @@ module HighFive
             FileUtils.cp(File.join(self.destination_root, "index.html"), File.join(@config.root, @config.dev_index))
           end
         end
-      
-        private 
+
+        private
 
         def builder
           @builder ||= get_builder
@@ -190,7 +189,7 @@ module HighFive
           builder
         end
 
-        #TODO: this probably doesn't work on windows 
+        #TODO: this probably doesn't work on windows
         def compress_javascript(file_name)
           say " -Compressing #{file_name} with yuicompressor", :yellow
 

data/lib/high_five/thor/tasks/development.rb

@@ -4,7 +4,7 @@ module HighFive
     module Tasks
       class Development < ::HighFive::Thor::Task
         include ::Thor::Actions
-        
+
         desc "server", "Run a web server for a specific environment or path"
         method_option :platform, :aliases => "-e", :desc => "Environemnt [production|development]", :default => "development"
         method_option :platform_path, :desc => "Path to ios or android directory for the platform we want to serve"
@@ -18,7 +18,7 @@ module HighFive
               end
             end
           else
-            root = base_config.build_platform_config(platform).destination_root
+            root = base_config.build_platform_config(platform).destination
           end
 
           puts "Starting server with root=#{root}"

data/lib/high_five/thor/tasks/{distribution.rb → dist.rb}

@@ -3,10 +3,10 @@ require 'high_five/android_helper'
 module HighFive
   module Thor
     module Tasks
-      class Distribution < ::HighFive::Thor::Task
+      class Dist < ::HighFive::Thor::Task
         include ::Thor::Actions
-        include IosHelper
-        include AndroidHelper
+        include ::HighFive::IosHelper
+        include ::HighFive::AndroidHelper
 
         default_task :dist
 
@@ -68,7 +68,9 @@ module HighFive
           system("ant -file '#{android_path}/build.xml' clean release #{ant_flags}")
 
           android_name = HighFive::AndroidHelper.project_name_from_build_xml("#{android_path}/build.xml")
+
           if @output_file_name
+            say "copying final build #{android_path}/bin/#{android_name}-release.apk -> #{android_path}/bin/#{@output_file_name}.apk"
             FileUtils.cp("#{android_path}/bin/#{android_name}-release.apk", "#{android_path}/bin/#{@output_file_name}.apk")
           end
         end

data/lib/high_five/thor/tasks/{initialization.rb → init.rb}

@@ -2,7 +2,7 @@ require 'fileutils'
 module HighFive
   module Thor
     module Tasks
-      class Initialization < ::HighFive::Thor::Task
+      class Init < ::HighFive::Thor::Task
         include ::Thor::Actions
         default_task :init
 
@@ -25,7 +25,7 @@ module HighFive
             end
           end
         end
-      end 
+      end
     end
   end
 end

data/lib/high_five/thor/tasks/{ios_tasks.rb → ios.rb}

@@ -4,11 +4,10 @@ require 'plist'
 module HighFive
   module Thor
     module Tasks
-      class IosTasks < ::HighFive::Thor::Task
+      class Ios < ::HighFive::Thor::Task
         include ::Thor::Actions
         include ::HighFive::IosHelper
         include ::HighFive::ImageHelper
-        namespace :ios
 
         desc "set_version", "build the debug apk via ant debug"
         method_option :version, :aliases => "-v", :desc => "Set main version"

data/lib/high_five/thor/tasks.rb

@@ -1,10 +1,16 @@
-require 'high_five/thor/tasks/deploy'
-require 'high_five/thor/tasks/distribution'
-require 'high_five/thor/tasks/initialization'
-require 'high_five/thor/tasks/android_tasks'
 module HighFive
   module Thor
-    module Tasks   
+    module Tasks
+      def self.load
+        Dir.glob(File.join(File.dirname(__FILE__), 'tasks', '**/*.rb')) do |file|
+          if File.file?(file)
+            ::Thor::Util.load_thorfile(file)
+            require file
+          end
+        end
+      end
     end
   end
-end
+end
+
+HighFive::Thor::Tasks.load

data/lib/high_five/version.rb

@@ -1,3 +1,3 @@
 module HighFive
-  VERSION = "0.2.10"
+  VERSION = "0.3.0"
 end

data/spec/android_tasks_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'chunky_png'
 
-describe HighFive::Thor::Tasks::AndroidTasks do
+describe HighFive::Thor::Tasks::Android do
   include HighFive::TestHelper
   include HighFive::AndroidHelper
 
@@ -23,7 +23,7 @@ describe HighFive::Thor::Tasks::AndroidTasks do
   context 'Set icon' do
     let(:drawable_dir) { File.join(@project_root, 'android', 'res') }
     before(:all) do
-      cli(HighFive::Thor::Tasks::AndroidTasks).set_icon File.join(@project_root, 'test_icon.png')
+      cli(HighFive::Thor::Tasks::Android).set_icon File.join(@project_root, 'test_icon.png')
     end
 
     it 'creates icons for each drawable- folder' do
@@ -53,7 +53,7 @@ describe HighFive::Thor::Tasks::AndroidTasks do
 
   context "Set version" do
     it 'updates version number' do
-      cli(HighFive::Thor::Tasks::AndroidTasks, version: '2.0').set_version
+      cli(HighFive::Thor::Tasks::Android, version: '2.0').set_version
       manifest = File.read(File.join(@project_root, 'android', 'AndroidManifest.xml'))
       expect(manifest).to match(/android:versionName="2.0"/)
     end

data/spec/init_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 require 'tmpdir'
 require 'fileutils'
 
-describe HighFive::Thor::Tasks::Initialization do 
+describe HighFive::Thor::Tasks::Init do
   before :each do
     @original_dir = Dir.pwd
     @project_root = Dir.mktmpdir("hi5")
@@ -15,7 +15,7 @@ describe HighFive::Thor::Tasks::Initialization do
   end
 
   it "should create high_five.rb in the config directory" do
-    ::HighFive::Thor::Tasks::Initialization.start(["init"])
+    ::HighFive::Thor::Tasks::Init.start(["init"])
     Dir.exists?(File.join(@project_root, "config")).should be_true
     File.exists?(File.join(@project_root, "config", "high_five.rb")).should be_true
     Dir.exists?(File.join(@project_root, "config", "high_five")).should be_true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: high_five
 version: !ruby/object:Gem::Version
-  version: 0.2.10
+  version: 0.3.0
 platform: ruby
 authors:
 - Brian Samson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-08 00:00:00.000000000 Z
+date: 2014-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 0.18.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 0.18.0
 - !ruby/object:Gem::Dependency
   name: compass
   requirement: !ruby/object:Gem::Requirement
@@ -178,6 +178,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.13.0
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: "Build, minify, and deal with different platforms and environments for
   your HTML5 app.\n    This is often used with PhoneGap but designed not to require
   it, and high_five can be used to deploy any kind of HTML/JS/CSS-based\n    application
@@ -203,7 +217,6 @@ files:
 - high_five.gemspec
 - lib/high_five.rb
 - lib/high_five/android_helper.rb
-- lib/high_five/cli.rb
 - lib/high_five/config.rb
 - lib/high_five/generators/manifest.erb
 - lib/high_five/image_helper.rb
@@ -211,12 +224,12 @@ files:
 - lib/high_five/thor/runner.rb
 - lib/high_five/thor/task.rb
 - lib/high_five/thor/tasks.rb
-- lib/high_five/thor/tasks/android_tasks.rb
+- lib/high_five/thor/tasks/android.rb
 - lib/high_five/thor/tasks/deploy.rb
 - lib/high_five/thor/tasks/development.rb
-- lib/high_five/thor/tasks/distribution.rb
-- lib/high_five/thor/tasks/initialization.rb
-- lib/high_five/thor/tasks/ios_tasks.rb
+- lib/high_five/thor/tasks/dist.rb
+- lib/high_five/thor/tasks/init.rb
+- lib/high_five/thor/tasks/ios.rb
 - lib/high_five/version.rb
 - spec/android_helper_spec.rb
 - spec/android_tasks_spec.rb

data/lib/high_five/cli.rb

@@ -1,32 +0,0 @@
-require 'thor'
-require 'high_five/config'
-
-module HighFive
-  class Cli < Thor
-    include Thor::Actions
-    include HighFive::InitTask
-    include HighFive::DeployTask
-    include HighFive::AndroidTasks
-    include HighFive::DistTask
-    # source root path for Thor::Actions commands
-
-    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)
-      end
-    end
-   
-    private
-    def base_config
-      begin 
-        @base_config ||= HighFive::Config.load
-      rescue StandardError => e
-        say e.message, :red
-        exit
-      end
-    end
-  end
-end