sombrero 0.0.8 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef0fd1444aebb7291dd470b2c3e35db00513223c
-  data.tar.gz: af0edc1f6a1b5475e04335b694e2b2827a3918f9
+  metadata.gz: 728b3df0b0b89665e7e5fec06812414d325ce620
+  data.tar.gz: b998ce6174285cb33b7341de46fa544b51570e45
 SHA512:
-  metadata.gz: 49969a561c69d8b4fce496b0c5672717212248ee88cb6412d5911499f1e7624875dcf21f85dcb488ad4701a10c523f79b55889437ceff62349b77302aad058f9
-  data.tar.gz: de203e8f601fd26b183e919162b3e9e64395a81f61fc81aab4e9298413d296775943ebada454afe9d3003f770af11340920a6b1fbccd271854679ec6ddfbe805
+  metadata.gz: b6c9fa48d4bf329d99bd65de7fa29b4a448e47714bc821ed0e92a0b421419fca3736346a19a8631d327142770355295ddc0402bb719b58cbc13a5e3047d5492b
+  data.tar.gz: f2764813e9c382d4c902e791c6c1702343ee09aba12f4db7b2f21e1f50b8af9fae55100f6beabd65ad13f073b7ba303c9a2246385abd8fad1b007ff73eb73aa5

data/app/base/rtcp_controller.rb

@@ -1,12 +1,12 @@
-class RTCPController < BaseController
-  map Cfg.baseurl + '__rtcp__'
+class RTCPController < Sombrero::RTCPController
+  map File.join(Cfg.baseurl, '__rtcp__')
 
   private
-  # called after socket connection established.
+  # called after socket connection established
   def connected
   end
 
-  # data sent to client after connection established.
+  # data sent to client after connection established
   def initialization_data
     {}
   end

data/app/config/config.rb

@@ -1,5 +1,3 @@
-# === Cfg is a required reserved hard-coded constant. === #
-# === If you change it the entire app will broke.     === #
 
 # loading .yml configs from current directory. config.yml will be loaded first.
 Cfg = Sombrero.load_config(File.expand_path('..', __FILE__))

data/app/config/config.yml

@@ -1,10 +1,11 @@
 # module SystemRequiredConfigs # Do NOT Remove!
 baseurl: /
 app:
-  url:
+  baseurl:
     development: /app
     production:  /app
-  dir: ./public
+  # relative to webpack.config.js
+  path: ./public
 # end
 
 # put here configs that will be the same on all environments.

data/app/core/Gemfile

@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE
+# do NOT edit this file, edit ../Gemfile instead
 gem 'sombrero'
 gem 'rocketio'
 gem 'tubesock'

data/app/core/boot.rb

@@ -1,5 +1,6 @@
-# DO NOT EDIT THIS FILE, all updates will be lost on next update.
-# edit base/boot.rb instead.
+# do NOT edit this file, edit base/boot.rb instead
+
+require 'yaml'
 
 Dir.chdir File.expand_path('../..', __FILE__) do
   require './base/boot'
@@ -12,6 +13,4 @@ Dir.chdir File.expand_path('../..', __FILE__) do
 
   require './base/helpers/application_helpers'
   Dir['./base/helpers/**/*.rb'].each {|f| require(f)}
-
-  require './base/load'
 end

data/app/core/generate_controllers_map.rb

@@ -1,4 +1,7 @@
 #!/usr/bin/env ruby
+
+# do NOT edit this file
+
 require File.expand_path('../load', __FILE__)
 
 Sombrero.generate_controllers_map(File.expand_path('../..', __FILE__))

data/app/core/generate_webpack_setup.rb

@@ -1,4 +1,7 @@
 #!/usr/bin/env ruby
+
+# do NOT edit this file
+
 require File.expand_path('../load', __FILE__)
 
 Sombrero.generate_webpack_setup(File.expand_path('../..', __FILE__))

data/app/core/load.rb

@@ -1,5 +1,7 @@
-# DO NOT EDIT THIS FILE, all updates will be lost on next update.
-# edit base/load.rb instead.
+# do NOT edit this file, edit base/load.rb instead
 
-require File.expand_path('../boot', __FILE__)
-require File.expand_path('../load_controllers', __FILE__)
+%w[
+  boot
+  ../base/load
+  load_controllers
+].each {|f| require File.expand_path("../#{f}", __FILE__)}

data/app/core/load_controllers.rb

@@ -1,5 +1,4 @@
-# DO NOT EDIT THIS FILE, all updates will be lost on next update.
-# edit base/load_controllers.rb instead.
+# do NOT edit this file, edit base/load_controllers.rb instead
 
 Dir.chdir File.expand_path('../..', __FILE__) do
 

data/app/webpack.config.js

@@ -16,9 +16,9 @@ console.log(JSON.stringify(setup, null, 2))
 module.exports = {
   entry: setup.entries,
   output: {
-    path: [setup.path, setup.url].join('/'),
+    path: [setup.path, setup.baseurl].join('/'),
     filename: '[name].js',
-    publicPath: setup.url + '/',  // trailing slash required
+    publicPath: setup.baseurl + '/',  // trailing slash required
     libraryTarget: 'commonjs2'
   },
   module: {
@@ -39,7 +39,8 @@ module.exports = {
   resolve: {
     extensions: ['', '.js', '.css', '.json', '.coffee', '.html'],
     alias: {
-      base: __dirname + '/base',
+      app: __dirname,
+      base: 'app/base',
       api: 'base/api',
     }
   },

data/lib/sombrero.rb

@@ -89,8 +89,8 @@ module Sombrero
 
     File.open File.expand_path('webpack_setup.json', dir), 'w' do |f|
       f << {
-        path: config[:app][:dir],
-        url: config[:app][:url][:development],
+        path: config[:app][:path],
+        baseurl: config[:app][:baseurl][:development],
         entries: entries
       }.to_json
     end

data/lib/sombrero/cli.rb

@@ -2,6 +2,7 @@ require 'fileutils'
 require 'pathname'
 require 'yaml'
 require 'pty'
+require 'sombrero/version'
 require 'sombrero/cli/helpers'
 require 'sombrero/cli/assertions'
 
@@ -20,6 +21,8 @@ module Sombrero
         generator(args)
       when 'd', 'docker'
         docker(args)
+      when 'v', '-v', '--version'
+        puts Sombrero::VERSION
       when nil, '-h', '--help'
         usage
       else

data/lib/sombrero/cli/app/install.rb

@@ -14,6 +14,7 @@ module Sombrero
         def install dir, working_dir_opted
           src = working_dir_opted ? BASE_DIR.to_path + '/.' : BASE_DIR
           FileUtils.cp_r(src, dir)
+          cleanup(dir)
         end
 
         def add_namespace dir, namespace
@@ -31,6 +32,10 @@ module Sombrero
           end
         end
 
+        def cleanup dir
+          Dir[dir / "**/.ignore"].each {|f| FileUtils.rm_f(f)}
+        end
+
       end
     end
   end

data/lib/sombrero/rtcp_controller.rb

@@ -20,13 +20,7 @@ module Sombrero
 
     def on_open
       connected
-      write(serial: 0, data: initialization_data.update(__initialization_data__))
-    end
-
-    def __initialization_data__
-      {
-        app_url: Cfg.app[:url][RocketIO.environment] || Cfg.app[:url][:development]
-      }
+      write(serial: 0, data: initialization_data)
     end
 
     def on_message msg
@@ -81,5 +75,23 @@ module Sombrero
     def write data
       @socket.send_data(data.to_json)
     end
+
+    # called after socket connection established
+    def connected
+    end
+
+    # data sent to client after connection established
+    def initialization_data
+      {}
+    end
+
+    # merged into original env when calling a controller
+    def rtcp_env
+      {}
+    end
+
+    # called when socket connection closed
+    def disconnected
+    end
   end
 end

data/lib/sombrero/version.rb

@@ -0,0 +1,3 @@
+module Sombrero
+  VERSION = '0.1.0'.freeze
+end

data/sombrero.gemspec

@@ -1,10 +1,9 @@
 # coding: utf-8
+require File.expand_path('../lib/sombrero/version', __FILE__)
 
 Gem::Specification.new do |spec|
-  spec.name, spec.version = %w[
-    sombrero
-    0.0.8
-  ]
+  spec.name = 'sombrero'
+  spec.version = Sombrero::VERSION
   spec.authors     = ['Slee Woo']
   spec.email       = ['mail@sleewoo.com']
   spec.summary     = [spec.name, spec.version]*'-',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sombrero
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.1.0
 platform: ruby
 authors:
 - Slee Woo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-17 00:00:00.000000000 Z
+date: 2016-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rocketio
@@ -52,9 +52,11 @@ files:
 - app/.pryrc
 - app/Gemfile
 - app/Rakefile
+- app/base/api/.ignore
 - app/base/base_controller.rb
 - app/base/boot.rb
 - app/base/helpers/application_helpers.rb
+- app/base/load.rb
 - app/base/load_controllers.rb
 - app/base/rtcp_controller.rb
 - app/config.ru
@@ -70,7 +72,9 @@ files:
 - app/core/generate_webpack_setup.rb
 - app/core/load.rb
 - app/core/load_controllers.rb
+- app/generators/api/.ignore
 - app/package.json
+- app/public/.ignore
 - app/webpack.config.js
 - bin/sombrero
 - docker/Dockerfile
@@ -99,6 +103,7 @@ files:
 - lib/sombrero/cli/generator.rb
 - lib/sombrero/cli/helpers.rb
 - lib/sombrero/rtcp_controller.rb
+- lib/sombrero/version.rb
 - sombrero.gemspec
 homepage: https://github.com/sleewoo/sombrero
 licenses:
@@ -123,5 +128,5 @@ rubyforge_project:
 rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: '["sombrero-0.0.8", "Opinionated stack for building opinionated web applications"]'
+summary: '["sombrero-0.1.0", "Opinionated stack for building opinionated web applications"]'
 test_files: []