inesita 0.3.2 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 128cb0e2fdec618eadbb291fe314c09e213a549a
-  data.tar.gz: c72d4643eb7034aa29802104c8aac1a250f5174a
+  metadata.gz: f91a4d1e673a6b2193f21bc02f314badc654850a
+  data.tar.gz: dcc841d257a207e7a1d7f7fd7395ab9a4617ff88
 SHA512:
-  metadata.gz: dd9a32e62454e2685c5772c7bb071351001447e951a99f9c01b77991f473804313051108a578c3a32c8a83266d66fab0174747fc7ee30922a7ee459bed839216
-  data.tar.gz: 266c547fef5472b0b867ef14aad998c7b6f66cee8d01e03559d94dca6fd69bb62eba2bc1b29481c6ad9918f8591d2aadcb7a6c4a64f9a9882d8fe0e9308bcb20
+  metadata.gz: 636404d836f94c733888575ed7660e4d80764b4c0d4d532309bee232f888c871b5d70f67e73eb7db48139c13bafbd5229257bcd5d0b4ebd62610268182239352
+  data.tar.gz: 7e9b6bec1ab7f51753b67c267afbcc53b16cddd4d9c9c67cf6f29e37b0457cd16ec89bc8a19e83dd945ad8dab96f4d8e3fed73bd0f452517019637c192b64775

data/CHANGELOG.md

@@ -1,6 +1,10 @@
+## 0.3.5 (10.03.2016)
+* add `inesita watch`
+* add `inesita build` dir parameters
+
 ## 0.3.2 (05.03.2016)
 * add `app_dist` and `app_dev` directory support
-* add `redirect_to` to route option
+* add `redirect_to` to `route` options
 
 ## 0.3.1 (05.01.2016)
 * add params hash to `router.url_for`

data/inesita.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'inesita'
-  s.version     = '0.3.2'
+  s.version     = '0.3.5'
   s.authors     = ['Michał Kalbarczyk']
   s.email       = 'fazibear@gmail.com'
   s.homepage    = 'http://github.com/inesita-rb/inesita'

data/lib/inesita.rb

@@ -18,18 +18,6 @@ require 'inesita/server'
 module Inesita
   module_function
 
-  def dist!
-    @env = :dist
-  end
-
-  def dev?
-    (@env || :dev) == :dev
-  end
-
-  def dist?
-    @env == :dist
-  end
-
   def assets_code
     @assets_code
   end

data/lib/inesita/cli.rb

@@ -16,3 +16,4 @@ require 'inesita/minify'
 require 'inesita/cli/build'
 require 'inesita/cli/server'
 require 'inesita/cli/new'
+require 'inesita/cli/watch'

data/lib/inesita/cli/build.rb

@@ -8,51 +8,68 @@ class InesitaCLI < Thor
   desc 'build [OPTIONS]', 'Build Inesita app'
 
   method_option :force,
-                aliases: ['-f'],
+                aliases: :f,
                 default: false,
                 desc: 'force overwrite'
 
-  method_option :destination,
-                aliases: ['-d', '-dir'],
+  method_option :destination_dir,
+                aliases: :d,
                 default: Inesita::Config::BUILD_DIR,
-                desc: 'build destination directory'
+                desc: 'destination directory'
 
-  def build
-    Inesita.dist!
-    assets = Inesita::Server.new.assets_app
+  method_option :source_dir,
+                aliases: :s,
+                default: Inesita::Config::APP_DIR,
+                desc: 'source (app) dir'
+
+  method_option :static_dir,
+                aliases: :t,
+                default: Inesita::Config::STATIC_DIR,
+                desc: 'static dir'
 
-    build_dir = options[:destination]
-    force = options[:force]
+  method_option :dist_source_dir,
+                aliases: :b,
+                default: Inesita::Config::APP_DIST_DIR,
+                desc: 'source (app) dir for dist build'
 
-    empty_directory build_dir, force: force
+  def build
+    assets = assets_server
+    empty_directory options[:destination_dir], force: options[:force]
 
-    copy_static(build_dir, force)
-    create_index(build_dir, assets['index.html'].source, force)
-    create_js(build_dir, assets['application.js'].source, force)
-    create_css(build_dir, assets['stylesheet.css'].source, force)
+    copy_static
+    create_asset(assets, 'index.html',     ->(s) { Inesita::Minify.html(s) })
+    create_asset(assets, 'application.js', ->(s) { Inesita::Minify.js(s) })
+    create_asset(assets, 'stylesheet.css', ->(s) { Inesita::Minify.css(s) })
   end
 
   no_commands do
-    def copy_static(build_dir, force)
-      Dir.glob('./static/**/*').each do |file|
+    def assets_server
+      Inesita::Server.new({
+        dist: true,
+        static_dir: options[:static_dir],
+        app_dir: options[:source_dir],
+        app_dist_dir: options[:app_dist_dir]
+      }).assets_app
+    end
+
+    def copy_static
+      destination_dir = options[:destination_dir]
+      force = options[:force]
+      static_dir = options[:static_dir]
+
+      Dir.glob("./#{static_dir}/**/*").each do |file|
         if File.directory?(file)
-          empty_directory File.join(build_dir, file), force: force
+          empty_directory File.join(destination_dir, file), force: force
         else
-          copy_file File.absolute_path(file), File.join(build_dir, file), force: force
+          copy_file File.absolute_path(file), File.join(destination_dir, file.gsub(static_dir, 'static')), force: force
         end
       end
     end
 
-    def create_index(build_dir, html, force)
-      create_file File.join(build_dir, 'index.html'), Inesita::Minify.html(html), force: force
-    end
-
-    def create_js(build_dir, javascript, force)
-      create_file File.join(build_dir, 'application.js'), Inesita::Minify.js(javascript),  force: force
-    end
-
-    def create_css(build_dir, stylesheet, force)
-      create_file File.join(build_dir, 'stylesheet.css'), Inesita::Minify.css(stylesheet), force: force
+    def create_asset(assets, name, minify_proc)
+      create_file File.join(options[:destination_dir], name),
+                  minify_proc.call(assets[name].source),
+                  force: options[:force]
     end
   end
 end

data/lib/inesita/cli/new.rb

@@ -8,7 +8,7 @@ class InesitaCLI < Thor
   desc 'new PROJECT_NAME', 'Create Inesita app'
 
   method_option :force,
-                aliases: ['-f'],
+                aliases: :f,
                 default: false,
                 desc: 'force overwrite'
 

data/lib/inesita/cli/server.rb

@@ -5,12 +5,12 @@ class InesitaCLI < Thor
 
   desc 'server [OPTIONS]', 'Starts Inesita server'
   method_option :port,
-                aliases: '-p',
+                aliases: :p,
                 default: 9292,
                 desc: 'The port Inesita will listen on'
 
   method_option :host,
-                aliases: '-h',
+                aliases: :h,
                 default: '127.0.0.1',
                 desc: 'The host address Inesita will bind to'
 

data/lib/inesita/cli/template/app/index.html.slim.tt

@@ -1,6 +1,7 @@
 doctype html
 html
   head
+    meta charset="UTF-8"
     title <%= config[:project_name] %>
     == Inesita.assets_code
   body

data/lib/inesita/cli/watch.rb

@@ -0,0 +1,46 @@
+class InesitaCLI < Thor
+  include Thor::Actions
+
+  check_unknown_options!
+
+  namespace :watch
+
+  desc 'watch [OPTIONS]', 'Watch files and build Inesita app'
+
+  method_option :force,
+                aliases: :f,
+                default: true,
+                desc: 'force overwrite'
+
+  method_option :destination_dir,
+                aliases: :d,
+                default: Inesita::Config::BUILD_DIR,
+                desc: 'destination directory'
+
+  method_option :source_dir,
+                aliases: :s,
+                default: Inesita::Config::APP_DIR,
+                desc: 'source (app) dir'
+
+  method_option :static_dir,
+                aliases: :t,
+                default: Inesita::Config::STATIC_DIR,
+                desc: 'static dir'
+
+  method_option :dist_source_dir,
+                aliases: :b,
+                default: Inesita::Config::APP_DIST_DIR,
+                desc: 'source (app) dir for dist build'
+
+  def watch
+    puts 'building...'
+    build
+    puts 'done.'
+    listener = Listen.to(options[:source_dir]) do |_modified, _added, _removed|
+      puts "rebuilding..."
+      build
+      puts "done."
+    end.start
+    loop { sleep 1000 }
+  end
+end

data/lib/inesita/server.rb

@@ -10,27 +10,41 @@ module Inesita
   class Server
     attr_reader :assets_app
 
-    def initialize
+    def initialize(opts = {})
+      setup_dirs(opts)
+      setup_env(opts)
       @assets_app = create_assets_app
       @source_maps_app = create_source_maps_app
       @app = create_app
       Inesita.assets_code = assets_code
     end
 
+    def setup_env(opts)
+      @dist = opts[:dist] || false
+    end
+
+    def setup_dirs(opts)
+      @static_dir = opts[:static_dir] || Config::STATIC_DIR
+      @app_dir = opts[:app_dir] || Config::APP_DIR
+      @app_dist_dir = opts[:app_dist_dir] || Config::APP_DIST_DIR
+      @app_dev_dir = opts[:app_dev_dir] || Config::APP_DEV_DIR
+    end
+
     def assets_code
-      assets_prefix = Inesita.dev? ? Config::ASSETS_PREFIX : nil
+      assets_prefix = @dist ? nil : Config::ASSETS_PREFIX
       %(
         <link rel="stylesheet" type="text/css" href="#{assets_prefix}/stylesheet.css">
-        #{Opal::Sprockets.javascript_include_tag('application', sprockets: @assets_app, prefix: assets_prefix, debug: Inesita.dev?)}
+        #{Opal::Sprockets.javascript_include_tag('application', sprockets: @assets_app, prefix: assets_prefix, debug: !@dist)}
        )
     end
 
     def create_app
       assets_app = @assets_app
       source_maps_app = @source_maps_app
+      static_dir = @static_dir
 
       Rack::Builder.new do
-        use Rack::Static, :urls => [Config::STATIC_DIR]
+        use Rack::Static, :urls => [static_dir]
 
         use Rack::Rewrite do
           rewrite(/^(?!#{Config::ASSETS_PREFIX}|#{Config::SOURCE_MAP_PREFIX}).*/, Config::ASSETS_PREFIX)
@@ -48,9 +62,12 @@ module Inesita
 
     def create_assets_app
       Opal::Server.new do |s|
-        s.append_path Config::APP_DIR
-        s.append_path Config::APP_DIST_DIR if Inesita.dist?
-        s.append_path Config::APP_DEV_DIR if Inesita.dev?
+        s.append_path @app_dir
+        if @dist
+          s.append_path @app_dist_dir
+        else
+          s.append_path @app_dev_dir
+        end
 
         Opal.paths.each do |p|
           s.append_path p

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inesita
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.5
 platform: ruby
 authors:
 - Michał Kalbarczyk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-05 00:00:00.000000000 Z
+date: 2016-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal
@@ -172,6 +172,7 @@ files:
 - lib/inesita/cli/template/app/stylesheet.css.sass.tt
 - lib/inesita/cli/template/config.ru.tt
 - lib/inesita/cli/template/static/inesita-rb.png
+- lib/inesita/cli/watch.rb
 - lib/inesita/config.rb
 - lib/inesita/live_reload.rb
 - lib/inesita/minify.rb