susanoo 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: feb35da8654f6e9da115613dcc34d765ee366e58
-  data.tar.gz: f352c4939a2caf43e8727813e116aff11d71d638
+  metadata.gz: 42930bc6bb2262172a0c6c7b6bc83cdbab6464af
+  data.tar.gz: d10a8200f2102779829d6d8626fce76fbae02328
 SHA512:
-  metadata.gz: dc95c529977db0c1cd06a5783fe6af6bbebbc170e85d4803aa63b5e6305dc99812984ef5d6724abf25d538a31cc6b26f62c5b9a2dc58cd5fc7a00fe9956905e5
-  data.tar.gz: b8c5ba8968ca373ee030b66085b6091a55cecd3d946fcfc64477e2855256be81a15866bc7b27788d583de6d92411f4a594db598ad93d72d10178b1450317c4d6
+  metadata.gz: a2752adf74a8c0374a3e6e5c6d764eaeece823efa17f2136a471d56ab466b9e29357f5b21b1d34048a8324d086311518b1489ac588ab3da632d551783184dede
+  data.tar.gz: 80b20e10c4164319469b6d272fb20a2294afa0d0c643eb03010f0564dd3ec5645cb3353ae5e621cd157641c8628fce90208bf4af05609daaf83c2ebcf62c9690

data/Gemfile

@@ -2,5 +2,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in Susanoo.gemspec
 gemspec
-
-gem "pry"

data/Susanoo.gemspec

@@ -4,23 +4,34 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'susanoo/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "susanoo"
+  spec.name          = 'susanoo'
   spec.version       = Susanoo::VERSION
-  spec.authors       = ["Sameer Rahmani"]
-  spec.email         = ["lxsameer@gnu.org"]
+  spec.authors       = ['Sameer Rahmani']
+  spec.email         = ['lxsameer@gnu.org']
   spec.description   = %q{ Develop mobile application using apache cordova and ruby utilities. }
   spec.summary       = %q{ Develop mobile application using apache cordova and ruby utilities. Take advantage of ruby gems to rapidly develop mobile applications}
-  spec.homepage      = "http://github.com/lxsameer/Susanoo"
-  spec.license       = "GPL-2"
+  spec.homepage      = 'http://github.com/lxsameer/Susanoo'
+  spec.license       = 'GPL-2'
 
   spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
-  spec.add_dependency "thor"
-  spec.add_dependency "colorize"
+  spec.add_development_dependency 'bundler', '~> 1.3'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'pry'
 
+  spec.add_dependency 'thor'
+  spec.add_dependency 'thin'
+  spec.add_dependency 'colorize'
+  spec.add_dependency 'lotus-router'
+  spec.add_dependency 'rack'
+  spec.add_dependency 'rack-rewrite'
+  spec.add_dependency 'uglifier', '~>2.1.1'
+  spec.add_dependency 'yui-compressor', '~>0.9.6'
+  spec.add_dependency 'sprockets', '~>2.11.0'
+  spec.add_dependency 'sprockets-helpers'
+  spec.add_dependency 'sass'
+  spec.add_dependency 'tilt'
 end

data/lib/susanoo.rb

@@ -1,9 +1,16 @@
-require "susanoo/version"
-require "colorize"
+require 'susanoo/version'
+require 'erb'
+require 'sprockets'
+require 'sprockets-helpers'
+require 'rack/rewrite'
+require 'tilt'
+require 'colorize'
+require 'lotus/router'
 
 module Susanoo
 end
-require 'susanoo/application'
-require 'susanoo/assets'
+
+require 'susanoo/controller'
 require 'susanoo/project'
 require 'susanoo/cli'
+require 'susanoo/application'

data/lib/susanoo/application.rb

@@ -1,14 +1,33 @@
-module Susanoo
-    class Application
-    @@debug = false
+require 'rack'
 
-    def self.debug?
-      @@debug
+class Susanoo::Application
+
+  class Index < Susanoo::Controller
+    def call(env)
+      template = Tilt.new(File.join(project_root, 'www/index.html.erb'))
+      [200, {'Content-Type' => 'text/html'}, [template.render(self)]]
     end
+  end
 
-    def self.debug=(value)
-      @@debug = value
+  class Assets < Susanoo::Controller
+    def call(env)
+      # [200, {'Content-Type' => 'text/html'}, [environment]]
+      run environment
     end
+  end
 
+  class Views < Susanoo::Controller
+    def call(env)
+      path =  env['PATH_INFO']
+      if File.exist?(File.join(project_root, "www/views#{path}.erb"))
+        template = Tilt.new(File.join(project_root, "www/views#{path}.erb"))
+      elsif File.exist?(File.join(project_root, "www/views#{path}"))
+        template = Tilt.new(File.join(project_root, "www/views#{path}"))
+      else
+        fail "There is no '#{path}' in 'www/views' directory."
+      end
+        [200, {'Content-Type' => 'text/html'}, [template.render(self)]]
+    end
   end
+
 end

data/lib/susanoo/cli/project.rb

@@ -6,16 +6,18 @@ module Susanoo
   module CLI
     class Project < Thor
 
-      package_name "Susanoo"
+      package_name 'Susanoo'
+
+      map 's' => :server
+      map 'g' => :generate
 
       def self.root=(path)
         @@root = path
         Susanoo::Project.path = path
       end
 
-      method_option :aliases => "g"
-      desc "generate GENERATOR [options]", "Run the given generator"
-      def generate(generator_name=nil, *options)
+      desc 'generate GENERATOR [options]', 'Run the given generator'
+      def generate(generator_name = nil, *options)
         if generator_name.nil?
           print_generator_list
           return
@@ -24,52 +26,24 @@ module Susanoo
         begin
           generator = Susanoo::Generators.const_get(camelize(generator_name.downcase))
         rescue NameError
-          print  "[Error]:".colorize(:red)
+          print  '[Error]:'.colorize(:red)
           say  "Generator `#{generator}` not found."
           exit 1
         end
         generator.start options
       end
 
-      desc "server", "Run development server."
-      def server(port=6000)
-        require 'sprockets'
-        require 'rack'
-        require 'rack/rewrite'
-
-        root = Dir.getwd
-        #Rack::Handler::WEBrick.run :Port => 3000, :DocumentRoot => root
-        server = Rack::Builder.app do
-          map "/statics" do
-            project_root = Dir.getwd
+      method_option :debug, default: false
+      desc 'server', 'Run development server.'
+      def server(port = 3000)
+        project_root = Susanoo::Project.path
+        require File.join(project_root, 'config/routes')
 
-            assets = Sprockets::Environment.new(project_root) do |env|
-              env.logger = Logger.new(STDOUT)
-            end
+        # Set global debug flag
+        Susanoo::Project.debug = options[:debug]
 
-            assets.append_path(File.join(project_root, 'www', 'assets'))
-            assets.append_path(File.join(project_root, 'www', 'assets', 'javascripts'))
-            assets.append_path(File.join(project_root, 'www', 'assets', 'stylesheets'))
-            assets.append_path(File.join(project_root, 'www', 'assets', 'images'))
-
-            run assets
-          end
-
-          map "/" do
-            use Rack::Static, :urls => [""], :index => "index.html"
-            run lambda { |env|
-              [
-               200,
-               {
-                 'Content-Type'  => 'text/html',
-                 'Cache-Control' => 'public, max-age=86400'
-               },
-               File.open('www/index.html', File::RDONLY)
-              ]
-            }
-          end
-        end
-        Rack::Handler::WEBrick.run(server, Port: port)
+        app = Rack::Server.start(app: ROUTER, server: :thin, Port: port,
+                                 debug: options[:debug])
       end
 
       private

data/lib/susanoo/controller.rb

@@ -0,0 +1,26 @@
+module Susanoo
+  class Controller
+
+    include Sprockets::Helpers
+
+    attr_accessor :environment
+    attr_accessor :debug
+    attr_accessor :project_root
+
+    def initialize
+      @project_root = Susanoo::Project.path
+
+      @environment = Sprockets::Environment.new(@project_root) do |env|
+        env.logger = Logger.new(STDOUT)
+      end
+
+      @environment.append_path(File.join(@project_root, 'www', 'assets'))
+      @environment.append_path(File.join(@project_root, 'www', 'assets', 'javascripts'))
+      @environment.append_path(File.join(@project_root, 'www', 'assets', 'stylesheets'))
+      @environment.append_path(File.join(@project_root, 'www', 'assets', 'images'))
+      @environment.append_path(File.join(@project_root, 'www', 'assets', 'fonts'))
+
+    end
+
+  end
+end

data/lib/susanoo/generators/frameworks.rb

@@ -42,7 +42,7 @@ module Susanoo
       def susanoo_files
         template "Gemfile", "#{Susanoo::Project.folder_name}/Gemfile"
         template "Rakefile", "#{Susanoo::Project.folder_name}/Rakefile"
-        template "config.ru", "#{Susanoo::Project.folder_name}/config.ru"
+        directory "config", "#{Susanoo::Project.folder_name}/config"
         template ".gitignore", "#{Susanoo::Project.folder_name}/.gitignore"
         template "bin/susanoo", "#{Susanoo::Project.folder_name}/bin/susanoo"
       end
@@ -89,7 +89,7 @@ module Susanoo
       end
 
       def install_templates
-        template "www/index.html", "#{Susanoo::Project.folder_name}/www/index.html"
+        template "www/index.html.erb", "#{Susanoo::Project.folder_name}/www/index.html.erb"
         template "www/views/main.html", "#{Susanoo::Project.folder_name}/www/views/main.html"
         template "www/assets/javascripts/application.js", "#{Susanoo::Project.folder_name}/www/assets/javascripts/application.js"
         template "www/assets/javascripts/functions.js", "#{Susanoo::Project.folder_name}/www/assets/javascripts/functions.js"

data/lib/susanoo/project.rb

@@ -5,6 +5,7 @@ module Susanoo
       attr_accessor :project_name
       attr_accessor :package_name
       attr_accessor :path
+      attr_accessor :debug
     end
   end
 end

data/lib/susanoo/templates/application/.gitignore

@@ -18,7 +18,6 @@ Android/gen/
 Android/assets/
 
 # generated files
-bin/
 gen/
 
 # Local configuration file (sdk path, etc)

data/lib/susanoo/templates/application/Gemfile

@@ -1,13 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'susanoo', '~><%= Susanoo::VERSION %>'
-gem 'rake'
-gem 'rack'
-gem 'rack-rewrite'
-gem 'thin'
-gem 'uglifier', '>=2.1.1'
-gem 'yui-compressor', '>=0.9.6'
-
-gem 'sprockets', '>=2.2.0'
-gem 'sass'
+gem 'susanoo', '~>0.5.0', path: '/home/lxsameer/src/Yellowen/Susanoo'
 gem 'pry'
+gem 'rerun'
+gem 'rack'

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

@@ -0,0 +1,8 @@
+if ENV.include? "SUSANOO_HOME"
+  $:.unshift ENV["SUSANOO_HOME"]
+end
+
+require 'susanoo'
+
+Susanoo::CLI::Project.root = File.expand_path("../../", __FILE__)
+Susanoo::CLI::Project.start

data/lib/susanoo/templates/application/config/routes.rb

@@ -0,0 +1,5 @@
+ROUTER = Lotus::Router.new do
+  get '/', to: Susanoo::Application::Index
+  get '/views/*', to: Susanoo::Application::Views
+  get '/assets/*', to: Susanoo::Application::Assets.new.environment
+end

data/lib/susanoo/templates/application/www/{index.html → index.html.erb}

@@ -5,13 +5,16 @@
     <meta name="format-detection" content="telephone=no" />
     <!-- WARNING: for iOS 7, remove the width=device-width and height=device-height attributes. See https://issues.apache.org/jira/browse/CB-4323 -->
     <meta name="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width, height=device-height" />
-    <link href="statics/application.css" rel="stylesheet">
+
+    <%= stylesheet_tag 'application', expand: Susanoo::Project.debug %>
+
     <title>Hello World</title>
   </head>
   <body>
     <div ng-view>
     </div>
     <script type="text/javascript" src="cordova.js"></script>
-    <script type="text/javascript" src="statics/application.js"></script>
+
+    <%= javascript_tag 'application', expand: Susanoo::Project.debug %>
   </body>
 </html>

data/lib/susanoo/version.rb

@@ -1,3 +1,3 @@
 module Susanoo
-  VERSION = "0.4.1"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: susanoo
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Sameer Rahmani
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-19 00:00:00.000000000 Z
+date: 2014-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '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'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: thin
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +94,132 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: lotus-router
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack-rewrite
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: uglifier
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.1.1
+- !ruby/object:Gem::Dependency
+  name: yui-compressor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.6
+- !ruby/object:Gem::Dependency
+  name: sprockets
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.11.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.11.0
+- !ruby/object:Gem::Dependency
+  name: sprockets-helpers
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sass
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: tilt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: " Develop mobile application using apache cordova and ruby utilities. "
 email:
 - lxsameer@gnu.org
@@ -88,6 +242,7 @@ files:
 - lib/susanoo/cli.rb
 - lib/susanoo/cli/global.rb
 - lib/susanoo/cli/project.rb
+- lib/susanoo/controller.rb
 - lib/susanoo/generators.rb
 - lib/susanoo/generators/cordova.rb
 - lib/susanoo/generators/frameworks.rb
@@ -103,7 +258,7 @@ files:
 - lib/susanoo/templates/application/Gemfile
 - lib/susanoo/templates/application/Rakefile
 - lib/susanoo/templates/application/bin/susanoo
-- lib/susanoo/templates/application/config.ru
+- lib/susanoo/templates/application/config/routes.rb
 - lib/susanoo/templates/application/www/assets/javascripts/app.js
 - lib/susanoo/templates/application/www/assets/javascripts/application.js
 - lib/susanoo/templates/application/www/assets/javascripts/functions.js
@@ -112,7 +267,7 @@ files:
 - lib/susanoo/templates/application/www/assets/javascripts/variables.js
 - lib/susanoo/templates/application/www/assets/stylesheets/application.css
 - lib/susanoo/templates/application/www/assets/stylesheets/main.scss
-- lib/susanoo/templates/application/www/index.html
+- lib/susanoo/templates/application/www/index.html.erb
 - lib/susanoo/templates/application/www/views/main.html
 - lib/susanoo/version.rb
 homepage: http://github.com/lxsameer/Susanoo

data/lib/susanoo/templates/application/config.ru

@@ -1,32 +0,0 @@
-require 'sprockets'
-require 'rack/rewrite'
-
-project_root = File.expand_path(File.dirname(__FILE__))
-
-assets = Sprockets::Environment.new(project_root) do |env|
-  env.logger = Logger.new(STDOUT)
-end
-
-assets.append_path(File.join(project_root, 'www', 'assets'))
-assets.append_path(File.join(project_root, 'www', 'assets', 'javascripts'))
-assets.append_path(File.join(project_root, 'www', 'assets', 'stylesheets'))
-assets.append_path(File.join(project_root, 'www', 'assets', 'images'))
-assets.append_path(File.join(project_root, 'www', 'assets', 'fonts'))
-
-map "/statics" do
-  run assets
-end
-
-map "/" do
-  use Rack::Static, :root => "www", :urls => [""], :index => "index.html"
-  run lambda { |env|
-    [
-     200,
-     {
-       'Content-Type'  => 'text/html',
-       'Cache-Control' => 'public, max-age=86400'
-     },
-     aFile.open('www/index.html', File::RDONLY)
-    ]
-  }
-end