appril-cli 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df94510f4634b8d7a6de0e38c6f7898a2c7ba4b4
-  data.tar.gz: 96cd232120ea588f7f0766804ee0872f884665f3
+  metadata.gz: 61b2c49ff11c5fedcc25016cc70eed0b218d2211
+  data.tar.gz: 46a6420c5cf7d573f0e4110719523823c7681238
 SHA512:
-  metadata.gz: 53068e6bde2328fffe044db9fa35d222fe474380def23e88ca01265f63b7d2b31629da5843a94a10595c8ded38cf8a6f35f4203de1a7e7834a2a120b46b3e52c
-  data.tar.gz: c6768da8a34b875d6e19925476fe8e102fb78823e97d053870f778bec197b572f50c5309df01ed1da37270ffe541e91ede99b893e25ac49f7b0f90f945377083
+  metadata.gz: d72448e5413aa4b19450adbf1caaec339a94539b2e90d0a55baaa08eaa9a4e82b8db4cf8266d762c0c5783b6410452d5726409ca9817a00c977927a15b7f7ccc
+  data.tar.gz: 1a4eb3f49d4fd871e254850ed1ba51a00baa322dfacca01c0e965b9e4f85e812572a65990c8619c2056777aba631c58c91f0364aa3354c254c1dee0b758f25df

data/boilerplate/app/base/api/rtcp_controller.rb

@@ -1,5 +1,5 @@
 class RTCPController < Appril::RTCPController
-  map File.join(Cfg.server_url, '__rtcp__')
+  map BaseController.url('__rtcp__')
 
   private
   # called after socket connection established

data/boilerplate/app/base/boot.rb

@@ -1,2 +1,2 @@
 # first file to be loaded when app starts.
-# it is loaded on bare metal, e.g. before any gems, configs, helpers.
+# it is loaded on bare metal, e.g. before any gems, configs etc.

data/boilerplate/app/base/load.rb

@@ -0,0 +1,2 @@
+# this file runs after app booted and before helpers, models and api loaded.
+# at this stage all gems and configs available.

data/boilerplate/app/config/config.rb

@@ -1,9 +1,14 @@
 
-# loading .yml configs from current directory. config.yml will be loaded first.
+# loading .yml configs from current directory.
+# config.yml will be loaded first.
 Cfg = Appril.load_config(File.expand_path('..', __FILE__))
 
 # it is highly recommended to freeze configs so they stay unaltered on runtime.
 Cfg.freeze
 
-# loading any .rb files in current dir. this one will be skipped automatically.
-Dir[File.expand_path('../**/*.rb', __FILE__)].each {|f| require(f)}
+# loading any .rb files in current dir.
+# this one will be skipped automatically.
+%w[
+  ../*.rb
+  ../**/*.rb
+].each {|p| Dir[File.expand_path(p, __FILE__)].each {|f| require(f)} }

data/boilerplate/app/core/boot.rb

@@ -6,34 +6,47 @@ require 'appril'
 module Appril
   extend self
 
-  def load_config dir, env = RocketIO.environment
-
-    config = load_config_file("#{dir}/config.yml")
-    config.update(load_config_file("#{dir}/env/#{env}.yml"))
-    config[:environment] = env.to_s.freeze
-
-    Dir["#{dir}/**/*.yml"].each do |file|
-      next if File.dirname(file) == './env'
-
-      key = File.basename(file, '.yml')
-      next if key == 'config' || key == 'appril'
-
-      key_config = load_config_file(file)
-      key_config_keys = key_config.keys.map(&:to_s)
-
-      config[key] = if key_config_keys.include?(env.to_s)
-        # current environment found, use it
-        key_config[env]
-      else
-        if RocketIO::ENVIRONMENTS.keys.find {|k| key_config_keys.include?(k)}
-          # there are some environment(s), but no current one so set current environment to nil
-          nil
-        else
-          # there are no environments, so this config is available on any environment
-          key_config
+  def load_config *dirs, env: RocketIO.environment
+
+    config = RocketIO.indifferent_params({environment: env.to_s.freeze})
+
+    dirs.each do |dir|
+      config.update(load_config_file("#{dir}/config.yml"))
+      config.update(load_config_file("#{dir}/env/#{env}.yml"))
+
+      loaded = [
+        File.expand_path("config.yml", dir),
+        File.expand_path("env/#{env}.yml", dir)
+      ]
+
+      %w[
+        *.yml
+        **/*.yml
+      ].each do |pattern|
+        Dir[File.join(dir, pattern)].each do |file|
+
+          path = File.expand_path(file, dir)
+          next if loaded.include?(path)
+          loaded << path
+
+          key = File.basename(file, '.yml')
+          key_config = load_config_file(file)
+          key_config_keys = key_config.keys.map(&:to_s)
+
+          config[key] = if key_config_keys.include?(config[:environment])
+            # current environment found, use it
+            key_config[config[:environment]]
+          else
+            if RocketIO::ENVIRONMENTS.keys.find {|k| key_config_keys.include?(k)}
+              # there are some environment(s), but no current one so set current environment to nil
+              nil
+            else
+              # there are no environments, so this config is available on any environment
+              key_config
+            end
+          end
         end
       end
-
     end
 
     def config.method_missing key
@@ -56,13 +69,4 @@ Dir.chdir File.expand_path('../..', __FILE__) do
   Bundler.require(RocketIO.environment)
 
   require './config/config'
-
-  require './base/helpers/application_helpers'
-  Dir['./base/helpers/**/*.rb'].each {|f| require(f)}
-
-  %w[
-    base_model.rb
-    *.rb
-    **/*.rb
-  ].each {|p| Dir[File.expand_path("../../base/models/#{p}", __FILE__)].each {|f| require(f)}}
 end

data/boilerplate/app/core/generate_configs.rb

@@ -8,7 +8,7 @@ module Appril
   extend self
 
   def generate_configs dir
-    config = load_config("#{dir}/config", :development)
+    config = load_config("#{dir}/config", env: :development)
 
     controllers = controllers_map(dir)
     webpack_entries = webpack_entries(dir, controllers)

data/boilerplate/app/core/load.rb

@@ -1,13 +1,9 @@
 # do NOT edit this file, edit ../base/load.rb instead
 
 Dir.chdir File.expand_path('../..', __FILE__) do
-
   require './core/boot'
   require './base/load'
-  require './base/api/base_controller'
-  require './base/api/rtcp_controller'
-
-  Dir['./base/api/**/server.rb'].sort {|a,b|
-    a.split(/\/+/).size <=> b.split(/\/+/).size
-  }.each {|f| require(f)}
+  require './core/load_helpers'
+  require './core/load_models'
+  require './core/load_api'
 end

data/boilerplate/app/core/load_api.rb

@@ -0,0 +1,10 @@
+
+%w[
+  base_controller.rb
+  rtcp_controller.rb
+  **/server.rb
+].each do |p|
+  Dir[File.expand_path("../../base/api/#{p}", __FILE__)].sort {|a,b|
+    a.split(/\/+/).size <=> b.split(/\/+/).size
+  }.each {|f| require(f)}
+end

data/boilerplate/app/core/load_helpers.rb

@@ -0,0 +1,6 @@
+
+%w[
+  application_helpers.rb
+  *.rb
+  **/*.rb
+].each {|p| Dir[File.expand_path("../../base/helpers/#{p}", __FILE__)].each {|f| require(f)}}

data/boilerplate/app/core/load_models.rb

@@ -0,0 +1,6 @@
+
+%w[
+  base_model.rb
+  *.rb
+  **/*.rb
+].each {|p| Dir[File.expand_path("../../base/models/#{p}", __FILE__)].each {|f| require(f)}}

data/boilerplate/crudle/base/api/index/client.coffee

@@ -0,0 +1,5 @@
+
+module.exports = (env) ->
+  env.render
+    el: 'body'
+    template: require('./layout')

data/boilerplate/crudle/base/api/index/layout.html

@@ -0,0 +1,5 @@
+<div class="jumbotron">
+  <h4>
+    Crudle Successfully Installed!
+  </h4>
+</div>

data/boilerplate/crudle/base/api/index/server.rb

@@ -0,0 +1,3 @@
+class Index < BaseController
+  map Cfg.server_url
+end

data/lib/appril-cli/version.rb

@@ -1,5 +1,5 @@
 module Appril
   class CLI
-    VERSION = '0.0.6'.freeze
+    VERSION = '0.0.7'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appril-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Slee Woo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-02 00:00:00.000000000 Z
+date: 2016-05-03 00:00:00.000000000 Z
 dependencies: []
 description: Appril CLI
 email:
@@ -53,6 +53,9 @@ files:
 - boilerplate/app/core/boot.rb
 - boilerplate/app/core/generate_configs.rb
 - boilerplate/app/core/load.rb
+- boilerplate/app/core/load_api.rb
+- boilerplate/app/core/load_helpers.rb
+- boilerplate/app/core/load_models.rb
 - boilerplate/app/generators/api/client.coffee
 - boilerplate/app/generators/api/layout.html
 - boilerplate/app/generators/api/server.rb
@@ -62,6 +65,9 @@ files:
 - boilerplate/app/var/.ignore
 - boilerplate/app/webpack.config.js
 - boilerplate/crudle/Gemfile
+- boilerplate/crudle/base/api/index/client.coffee
+- boilerplate/crudle/base/api/index/layout.html
+- boilerplate/crudle/base/api/index/server.rb
 - boilerplate/crudle/base/core.coffee
 - boilerplate/crudle/base/templates/menu.html
 - boilerplate/crudle/generators/api/client.coffee
@@ -152,5 +158,5 @@ rubyforge_project:
 rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: '["appril-cli-0.0.6", "Appril CLI"]'
+summary: '["appril-cli-0.0.7", "Appril CLI"]'
 test_files: []