susanoo 0.11.1 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a60434fd2b6833cf7f36852561010e0152ac5c1
-  data.tar.gz: 845d540cd2405d33c811f2a343b780af89cbc0aa
+  metadata.gz: d4086a3dff1194bc49fcce65b34876d9c6d66a8d
+  data.tar.gz: 975a9d183243d833cbff060fdeb9239b4ecbb02f
 SHA512:
-  metadata.gz: 982b59aa7413e9735bbbb5729cd12de1a78f9ce317ac8423fb445300820f867f51081946468a24dd7f35b9a06711faca9efa1dd164a8d6510f7e5898f405f308
-  data.tar.gz: 0ec7803ac0cf7264fd4204678f5f40f37f736345758337ae0eb38ab5ee585358524c4c1c49660fba683a08d20284a9b4e9ebce4ea81e26175942f1c6ce36d103
+  metadata.gz: edeedacdc86029542c823fc30db887caac1efa16b755263c6a335e3be061640a2ea4e7da6764e55ef3e8a432b2079211e50b2dc98578f76ed106c6dedf4a5d12
+  data.tar.gz: 4c917db03b1fbe1c743e51a2ddbad1a730b0abf544864789026d7701d43ea95907d301f8ef79f773584027bf1b9eb0d1060887a574e5bb3fdea34fba5172ce44

data/lib/susanoo.rb

@@ -6,6 +6,8 @@ require 'rack/rewrite'
 require 'tilt'
 require 'colorize'
 require 'lotus/router'
+require 'active_support'
+#require 'active_support/core_ext/string/inflections'
 
 module Susanoo
 end

data/lib/susanoo/cli.rb

@@ -1,9 +1,8 @@
 require 'rubygems'
 
 require 'pathname'
-require 'susanoo/cli/global'
-require 'susanoo/cli/project'
-require 'active_support/core_ext/string/inflections'
+require 'susanoo/cli/global_interface'
+require 'susanoo/cli/project_interface'
 
 
 module Susanoo
@@ -13,7 +12,7 @@ module Susanoo
 
     def self.run
       unless execute
-        Susanoo::CLI::Global.start
+        Susanoo::CLI::GlobalInterface.start
       end
     end
 

data/lib/susanoo/cli/project_interface.rb

@@ -0,0 +1,41 @@
+require 'thor'
+
+require_relative './project_interface/commands'
+
+module Susanoo
+  module CLI
+    # Project wide `Thor` class which is responsible for
+    # each command that user execute inside project
+    class ProjectInterface < Thor
+
+      # Include the Thor actions
+      include ::Thor::Actions
+
+      package_name 'Susanoo'
+
+      # Set the project root
+      def self.root=(path)
+        @@root = path
+        Susanoo::Project.path = path
+      end
+
+      # Set source paths for current generator
+      def self.source_root
+        "#{@@root}/src"
+      end
+
+      include Susanoo::CLI::Commands::Server
+      include Susanoo::CLI::Commands::Generate
+      include Susanoo::CLI::Commands::Build
+      include Susanoo::CLI::Commands::Console
+      include Susanoo::CLI::Commands::Run
+
+
+      private
+
+      def project_root
+        Susanoo::Project.path
+      end
+    end
+  end
+end

data/lib/susanoo/cli/project_interface/build.rb

@@ -0,0 +1,50 @@
+module Susanoo::CLI
+  module Commands
+    # Provide the `generate` & `destroy` commands for project wide usage.
+    module Build
+      extend ::ActiveSupport::Concern
+
+      included do
+
+        map 'b' => :build
+
+        desc 'build [PLATFORM]', 'Build the application for given PLATFORM (default=android).'
+        def build(platform = 'android')
+
+          require File.join(project_root, 'config/routes')
+          router = ROUTER.instance_variable_get('@router')
+
+          build_dir = File.join(project_root, 'www')
+          # setup build directory
+
+          remove_file build_dir if File.exist? build_dir
+          # Create the www directory if there isn't
+          # WWW directory will be the build directory
+          # which will contains the static files.
+          #
+          # NOTE: cordova only uses this directory
+          # and we can't change it as far as I know
+          empty_directory build_dir
+
+          router.routes.each do |route|
+            controller = route.dest
+            if controller.respond_to? :build
+              say_status 'build', "Controller: #{controller.__getobj__.class}"
+
+              # options to pass to controller build method
+              options = {
+                route: route.dup,
+                platform: platform
+              }
+
+              controller.build(self, options)
+            else
+              say_status 'warning', "#{controller.__getobj__.class.to_s}' does not have 'build' method.",
+              :yellow
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/susanoo/cli/project_interface/commands.rb

@@ -0,0 +1,5 @@
+require_relative 'server'
+require_relative 'generate'
+require_relative 'build'
+require_relative 'console'
+require_relative 'run'

data/lib/susanoo/cli/project_interface/console.rb

@@ -0,0 +1,23 @@
+require 'susanoo/irb'
+
+module Susanoo::CLI
+  module Commands
+    # Provide the `console` command for project wide usage.
+    module Console
+      extend ::ActiveSupport::Concern
+
+      included do
+
+        map 'c' => :console
+
+        desc 'console', 'Run pry in environment of `Susanoo`. '
+        def console
+          project_root = Susanoo::Project.path
+          require File.join(project_root, 'config/routes')
+
+          IRB.start_session(binding)
+        end
+      end
+    end
+  end
+end

data/lib/susanoo/cli/project_interface/generate.rb

@@ -0,0 +1,71 @@
+require 'susanoo/generators'
+
+module Susanoo::CLI
+  module Commands
+    # Provide the `generate` & `destroy` commands for project wide usage.
+    module Generate
+      extend ::ActiveSupport::Concern
+
+      included do
+        map 'g' => :generate
+        map 'd' => :destroy
+
+        desc 'generate GENERATOR [options]', 'Run the given generator'
+        def generate(generator_name = nil, *options)
+          generator = get_the_generator_class generator_name
+          # Run the generator with given options
+          generator.start(options, behavior: :invoke,
+                          destination_root: project_root)
+        end
+
+        desc 'destroy GENERATOR [options]', 'Destroy the given generator'
+        def destroy(generator_name = nil, *options)
+          generator = get_the_generator_class generator_name
+
+          generator.start(options, behavior: :revoke,
+                          destination_root: project_root)
+        end
+
+      end
+
+      private
+
+      def print_generator_list
+        say 'Available generators:'
+        say '---------------------------------------------------'
+        Susanoo::Generators.constants.each do |g|
+          generator = Susanoo::Generators.const_get(g)
+
+          if generator.respond_to?(:global_generator?) && \
+            !generator.global_generator?
+            generator_name = generator.to_s.split('::').last.underscore
+            say "#{generator_name}\t\t #{generator.desc}\n"
+          end
+
+        end
+
+      end
+
+      def get_the_generator_class(generator_name)
+        # Print the generators list and exit
+        if generator_name.nil?
+          print_generator_list
+          return
+        end
+
+        # Try to load and get the generator Class
+        begin
+          klass = generator_name.downcase.camelize
+          generator = Susanoo::Generators.const_get(klass)
+
+        rescue NameError
+          say_status 'Error', "Generator `#{generator_name}` not found.",
+                     :red
+          exit 1
+        end
+        generator
+      end
+
+    end
+  end
+end

data/lib/susanoo/cli/project_interface/run.rb

@@ -0,0 +1,23 @@
+module Susanoo::CLI
+  module Commands
+    # Provide the `run` command for project wide usage.
+    module Run
+      extend ::ActiveSupport::Concern
+
+      included do
+
+        map 'r' => :run_in
+
+        desc 'run PLATFORM', 'Run application on PLATFORM.'
+        def run_in(platform = :android)
+          # Build the project first
+          build
+          inside Susanoo::Project.path do
+            system "cordova run #{platform.to_s}"
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/susanoo/cli/project_interface/server.rb

@@ -0,0 +1,66 @@
+module Susanoo::CLI
+  module Commands
+    # Provide the `server` command for project wide usage.
+    module Server
+      extend ::ActiveSupport::Concern
+
+      included do
+        map 's' => :server
+
+        method_option :debug, default: true
+        method_option :built, default: false
+        method_option :port, default: 3000
+        desc 'server [PLATFROM]', 'Run development server. Simulate the given PLATFORM'
+        def server(platform = 'android')
+          port = options[:port]
+
+          if options[:built]
+            return not_built unless built?
+            app = static_server_for platform
+
+          else
+            require File.join(project_root, 'config/routes')
+            # Set global debug flag
+            Susanoo::Project.debug = options[:debug]
+            app = ROUTER
+
+          end
+          # Run the selected application to serve the project
+          Rack::Server.start(app: app, server: :thin, Port: port,
+                             debug: options[:debug])
+        end
+      end
+
+      private
+
+      # Does project is built?
+      def built?
+        return false unless File.directory? File.join(project_root, 'www')
+        true
+      end
+
+      def not_built
+        error "'www' directory is not present. Build you app first."
+      end
+
+      # Return a `Rack` applciation which will serve the
+      # already built project under specific platform path
+      def static_server_for(platform)
+        require 'rack/rewrite'
+
+        root = project_root
+
+        app = Rack::Builder.new do
+          use Rack::Rewrite do
+            rewrite   '/',  "/#{platform}_asset/www"
+          end
+
+          map "/#{platform}_asset/www/" do
+            run Rack::Directory.new File.join(root, 'www')
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/susanoo/controllers/assets.rb

@@ -11,26 +11,38 @@ class Susanoo::Application
       environment.call env
     end
 
-    def build(generator, route)
-      assets = Sprockets::Environment.new
-      assets.append_path File.join(project_root,
+    def build(generator, options)
+      platform = options[:platform]
+
+      Sprockets::Helpers.configure do |config|
+        config.prefix      = "/#{platform}_asset/www/assets"
+        config.debug       = false
+        config.environment = @environment
+      end
+
+      @environment.append_path File.join(project_root,
                                    'src/assets/javascripts')
-      assets.append_path File.join(project_root,
-                                   'src/assets/stylesheets')
+      @environment.append_path File.join(project_root,
+                             'src/assets/stylesheets')
+
+      @environment.append_path File.join(project_root,
+                                   'src/assets/fonts')
+
 
       func = lambda do |path, filename|
         filename !~ %r~assets~  && !%w[.js .css].include?(File.extname(path))
       end
 
       precompile = [func, /(?:\/|\\|\A)application\.(css|js)$/]
-      assets.each_logical_path(*precompile).each {|path|
+      @environment.each_logical_path(*precompile).each {|path|
         case File.extname(path)
         when '.js'
           dir = 'javascripts'
         when '.css'
           dir = 'stylesheets'
         end
-        assets[path].write_to "www/assets/#{dir}/#{path}"
+        @environment[path].write_to "www/assets/#{path}"
+        #@environment[path].write_to "www/assets/#{dir}/#{path}"
       }
 
       if File.exist? File.join(project_root,

data/lib/susanoo/controllers/index.rb

@@ -10,11 +10,13 @@ class Susanoo::Application
       [200, {'Content-Type' => 'text/html'}, [template.render(self)]]
     end
 
-    def build(generator, route)
+    def build(generator, options)
+      platform = options[:platform]
+
       # Configure Sprockets::Helpers (if necessary)
       Sprockets::Helpers.configure do |config|
         config.environment = @environment
-        config.prefix      = 'assets'
+        config.prefix      = "/#{platform}_asset/www/assets"
         config.debug       = false
       end
 

data/lib/susanoo/controllers/static.rb

@@ -20,7 +20,8 @@ class Susanoo::Application
       end
     end
 
-    def build(generator, route)
+    def build(generator, options)
+      route = options[:route]
       file = route.path_for_generation[1..-1]
       generator.copy_file file, "www/#{route.path_for_generation}"
     end

data/lib/susanoo/controllers/views.rb

@@ -15,7 +15,7 @@ class Susanoo::Application
       [200, {'Content-Type' => 'text/html'}, [template.render(self)]]
     end
 
-    def build(generator, route)
+    def build(generator, options)
       file_pattern = File.join(project_root, 'src/views/**/*.{html,html.erb}')
       dest_path = File.join(project_root, 'www')
       src_path = File.join(project_root, 'src')

data/lib/susanoo/templates/application/bin/susanoo

@@ -4,5 +4,5 @@ end
 
 require 'susanoo'
 
-Susanoo::CLI::Project.root = File.expand_path("../../", __FILE__)
-Susanoo::CLI::Project.start
+Susanoo::CLI::ProjectInterface.root = File.expand_path("../../", __FILE__)
+Susanoo::CLI::ProjectInterface.start

data/lib/susanoo/version.rb

@@ -1,3 +1,3 @@
 module Susanoo
-  VERSION = '0.11.1'
+  VERSION = '0.12.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: susanoo
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.12.0
 platform: ruby
 authors:
 - Sameer Rahmani
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-11 00:00:00.000000000 Z
+date: 2014-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -258,8 +258,15 @@ files:
 - lib/susanoo/application.rb
 - lib/susanoo/assets.rb
 - lib/susanoo/cli.rb
-- lib/susanoo/cli/global.rb
-- lib/susanoo/cli/project.rb
+- lib/susanoo/cli/global_interface.rb
+- lib/susanoo/cli/global_interface/.keep
+- lib/susanoo/cli/project_interface.rb
+- lib/susanoo/cli/project_interface/build.rb
+- lib/susanoo/cli/project_interface/commands.rb
+- lib/susanoo/cli/project_interface/console.rb
+- lib/susanoo/cli/project_interface/generate.rb
+- lib/susanoo/cli/project_interface/run.rb
+- lib/susanoo/cli/project_interface/server.rb
 - lib/susanoo/controller.rb
 - lib/susanoo/controllers/assets.rb
 - lib/susanoo/controllers/index.rb

data/lib/susanoo/cli/project.rb

@@ -1,163 +0,0 @@
-require 'thor'
-require 'susanoo/generators'
-require 'susanoo/irb'
-
-module Susanoo
-  module CLI
-    class Project < Thor
-
-      include ::Thor::Actions
-
-      package_name 'Susanoo'
-
-      map 's' => :server
-      map 'g' => :generate
-      map 'r' => :run_in
-      map 'd' => :destroy
-      map 'b' => :build
-      map 'c' => :console
-
-      # Set the project root
-      def self.root=(path)
-        @@root = path
-        Susanoo::Project.path = path
-      end
-
-      # Set source paths for current generator
-      def self.source_root
-        "#{@@root}/src"
-      end
-
-      desc 'generate GENERATOR [options]', 'Run the given generator'
-      def generate(generator_name = nil, *options)
-        generator = get_the_generator_class generator_name
-        # Run the generator with given options
-        generator.start(options, behavior: :invoke,
-                        destination_root: Susanoo::Project.path)
-      end
-
-      desc 'destroy GENERATOR [options]', 'Destroy the given generator'
-      def destroy(generator_name = nil, *options)
-        generator = get_the_generator_class generator_name
-
-        generator.start(options, behavior: :revoke,
-                        destination_root: Susanoo::Project.path)
-      end
-
-      method_option :debug, default: true
-      method_option :built, default: false
-      desc 'server', 'Run development server.'
-      def server(port = 3000)
-        project_root = Susanoo::Project.path
-
-        if options[:built]
-          unless File.directory? File.join(project_root, 'www')
-            error "'www' directory is not present. Build you app first."
-            return
-          end
-
-          app = Rack::Directory.new File.join(project_root, 'www')
-
-        else
-          require File.join(project_root, 'config/routes')
-          # Set global debug flag
-          Susanoo::Project.debug = options[:debug]
-
-          app = ROUTER
-        end
-
-        Rack::Server.start(app: app, server: :thin, Port: port,
-                           debug: options[:debug])
-      end
-
-      desc 'build', 'Build the application.'
-      def build
-        project_root = Susanoo::Project.path
-
-        require File.join(project_root, 'config/routes')
-
-        router = ROUTER.instance_variable_get('@router')
-
-        build_dir = File.join(project_root, 'www')
-        # setup build directory
-
-        remove_file build_dir if File.exist? build_dir
-        # Create the www directory if there isn't
-        # WWW directory will be the build directory
-        # which will contains the static files.
-        #
-        # NOTE: cordova only uses this directory
-        # and we can't change it as far as I know
-        empty_directory build_dir
-
-        router.routes.each do |route|
-          controller = route.dest
-          if controller.respond_to? :build
-            say_status 'build', "Controller: #{controller.__getobj__.class}"
-            controller.build(self, route.dup)
-          else
-            say_status 'warning', "#{controller.__getobj__.class.to_s}' does not have 'build' method.",
-                       :yellow
-          end
-        end
-      end
-
-      desc 'run PLATFORM', 'Run application on PLATFORM.'
-      def run_in(platform = :android)
-        # Build the project first
-        build
-
-        inside Susanoo::Project.path do
-          system "cordova run #{platform.to_s}"
-        end
-      end
-
-      desc 'console', 'Run pry in environment of `Susanoo`. '
-      def console
-        project_root = Susanoo::Project.path
-        require File.join(project_root, 'config/routes')
-
-        IRB.start_session(binding)
-      end
-
-      private
-      # Private ---------------------------
-
-      def get_the_generator_class(generator_name)
-        # Print the generators list and exit
-        if generator_name.nil?
-          print_generator_list
-          return
-        end
-
-        # Try to load and get the generator Class
-        begin
-          klass = generator_name.downcase.camelize
-          generator = Susanoo::Generators.const_get(klass)
-
-        rescue NameError
-          say_status 'Error', "Generator `#{generator_name}` not found.",
-                     :red
-          exit 1
-        end
-        generator
-      end
-
-      def print_generator_list
-        say 'Available generators:'
-        say '---------------------------------------------------'
-        Susanoo::Generators.constants.each do |g|
-          generator = Susanoo::Generators.const_get(g)
-
-          if generator.respond_to?(:global_generator?) && \
-            !generator.global_generator?
-            generator_name = generator.to_s.split('::').last.underscore
-            say "#{generator_name}\t\t #{generator.desc}\n"
-          end
-
-        end
-
-      end
-    end
-  end
-end