sombrero 0.0.3 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51dd5e5538976b9b9aa7f5a00418977a64fa681d
-  data.tar.gz: f6d7efa85002ef65ac32062f93a9011da236c34b
+  metadata.gz: a5b002e39512744bcfd75b264bf2cd820fcff6a6
+  data.tar.gz: 626e16bd372b366c5ffb30cddbb8d2cb1756e704
 SHA512:
-  metadata.gz: a16bcd25b06c8f693d7deea1f2720c8e7bb94a8c1a1bf6a00cf935f3e072694818bbb06eeb3b6338bd70b4c1ad62f2a8a682a3e1a8c9ef75014d1a65f030d3ea
-  data.tar.gz: ca2ca051ddebac6a4e40b10e1d3253c4c571f509cc447fb509442206b7900c455576b6685b14914b13a433468de52a758630e8224203f6f23253f407cc73877b
+  metadata.gz: 0e14d044b87844c5fca8b44a028832fadf43981bc91d5d14b718cb14e7ec51d2d56771f4c29d5dcab4a2592aa073c9a08bba07e3203911104dce58172565517a
+  data.tar.gz: 51f1eaf67c0313e120428138de8f78a410af012021daf46b7a383832048e6918760d12e3232f6a2f29b89b5e6b20b77da6de37cb285962198ce3011f3414e788

data/app/package.json

@@ -1,5 +1,5 @@
 {
   "dependencies": {
-    
+    "sombrero": "*"
   }
 }

data/app/webpack.config.js

@@ -39,9 +39,8 @@ module.exports = {
   resolve: {
     extensions: ['', '.js', '.css', '.json', '.coffee', '.html'],
     alias: {
-      core: __dirname + '/core/client',
       base: __dirname + '/base',
-      api:  __dirname + '/base/api',
+      api: 'base/api',
     }
   },
   plugins: [

data/docker/base/build.sh

@@ -15,11 +15,9 @@ echo "http://dl-4.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories
 apk update
 apk upgrade
 
-apk add build-base runit nmap-ncat libxml2 libxml2-dev libxslt libxslt-dev \
+apk add build-base runit curl nmap-ncat \
   ruby ruby-dev ruby-irb ruby-io-console ruby-bigdecimal \
-  nodejs nodejs-dev python git \
-  redis libpq postgresql-dev \
-  imagemagick imagemagick-dev
+  nodejs nodejs-dev
 
 curl -fsSL curl.haxx.se/ca/cacert.pem -o "$(ruby -ropenssl -e 'puts OpenSSL::X509::DEFAULT_CERT_FILE')"
 echo 'gem: --no-ri --no-rdoc' > /root/.gemrc

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

@@ -2,34 +2,33 @@ module Sombrero
   class CLI
     class App
       class Install
-        include InstallHelpers
+        include Helpers
 
-        def initialize dir, namespace
-          ensure_dirname_exists(dir)
-          assert_installable_dir(dir)
-          install(dir, namespace)
+        def initialize dir, namespace: nil, working_dir_opted: false
+          install(dir, working_dir_opted)
+          make_executable(dir / 'core/generate_webpack_setup.rb', dir / 'core/generate_controllers_map.rb')
+          add_namespace(dir, namespace) if namespace
+          puts "Done. All files installed into #{dir}"
         end
 
-        def install dir, namespace
-          src = dir.to_path == '.' ? BASE_DIR.to_path + '/.' : BASE_DIR
+        def install dir, working_dir_opted
+          src = working_dir_opted ? BASE_DIR.to_path + '/.' : BASE_DIR
           FileUtils.cp_r(src, dir)
-          FileUtils.chmod('+x', dir / 'core/generate_webpack_setup.rb')
-          FileUtils.chmod('+x', dir / 'core/generate_controllers_map.rb')
-          if namespace
-            %w[
-              base/base_controller.rb
-              base/rtcp_controller.rb
-              config/config.rb
-            ].each do |file|
-              code = File.read(dir / file)
-              File.open dir / file, 'w' do |f|
-                f.puts "module #{namespace}"
-                code.split("\n").each {|l| f.puts "  #{l}"}
-                f.puts "end"
-              end
+        end
+
+        def add_namespace dir, namespace
+          %w[
+            base/base_controller.rb
+            base/rtcp_controller.rb
+            config/config.rb
+          ].each do |file|
+            code = File.read(dir / file)
+            File.open dir / file, 'w' do |f|
+              f.puts "module #{namespace}"
+              code.split("\n").each {|l| f.puts "  #{l}"}
+              f.puts "end"
             end
           end
-          puts "Done. All files installed into #{dir}"
         end
 
       end

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

@@ -2,18 +2,24 @@ module Sombrero
   class CLI
     class App
       class Update
+        include Helpers
 
         def initialize dir
-          assert_is_a_sombrero_dir(dir)
-        end
+          FileUtils.rm_rf(dir / 'core')
+          Dir.chdir BASE_DIR do
 
-        def assert_is_a_sombrero_dir dir
+            Dir['**/*'].select {|e| File.file?(e)}.each do |file|
+              next if File.file?(dir / file)
+              create_dirname_for(dir / file)
+              puts "Installing #{File.basename(dir)}/#{file}"
+              FileUtils.cp(file, dir / file)
+            end
 
+          end
+          make_executable(dir / 'core/generate_webpack_setup.rb', dir / 'core/generate_controllers_map.rb')
+          puts "Done"
         end
 
-        def update
-
-        end
       end
     end
   end

data/lib/sombrero/cli/assertions.rb

@@ -0,0 +1,60 @@
+module Sombrero
+  class CLI
+    module Assertions
+
+      def assert_directory_provided dir
+        return if dir
+        fatal_error! "Please provide a directory"
+      end
+
+      def assert_installable_dir dir, working_dir_opted
+        if working_dir_opted
+          assert_empty_directory(dir)
+        else
+          assert_directory_does_not_exists(dir)
+        end
+      end
+
+      def assert_is_docker_dir dir
+        return if File.exists?(dir / Docker::CONFIG_FILE)
+        fatal_error! "#{dir} does not look like a Sombrero docker dir"
+      end
+
+      def assert_is_app_dir dir
+        return if %w[
+          core
+          base/api
+          config
+        ].all? {|e| File.exists?(dir / e)}
+        fatal_error! "#{dir} does not look like a Sombrero app dir"
+      end
+
+      def assert_empty_directory dir
+        return if Dir[dir / '*'].empty?
+        fatal_error! "#{dir} should be empty"
+      end
+
+      def assert_directory_exists dir
+        return if File.directory?(dir)
+        fatal_error! "#{dir} should be a directory"
+      end
+
+      def assert_directory_does_not_exists dir
+        return unless File.exists?(dir)
+        fatal_error! "#{dir} already exists"
+      end
+
+      def assert_config_file_exists dir
+        return if File.file?(dir / Docker::CONFIG_FILE)
+        fatal_error! "#{dir / Docker::CONFIG_FILE} file is missing"
+      end
+
+      def assert_valid_api_name_given api_name
+        api_name || fatal_error!('Please provide api name')
+        api_name =~ /\W/ && fatal_error!('Api name should contain only alphanumerics')
+        api_name =~ /\A[a-z]/i || fatal_error!('Api name should start with a letter')
+      end
+
+    end
+  end
+end

data/lib/sombrero/cli/docker/build.rb

@@ -3,11 +3,8 @@ module Sombrero
     module Docker
       class Build
 
-        def initialize dir, args
-          check_working_dir(dir)
-
+        def initialize dir, update_runner_only: false, push_opted: false
           Dir.chdir dir do
-            check_config_file
 
             config = load_config
             validate_config(config)
@@ -20,42 +17,25 @@ module Sombrero
 
             app_dir = Pathname.new(File.expand_path(config['APP_DIR']))
 
-            unless skip_build?(args)
+            if update_runner_only
+              puts "Skipping image building"
+            else
               prepare_build(build_dir, app_dir)
 
               image_built = build_image(build_dir, config['IMAGE_NAME'], config['BUILD_OPTS'])
 
-              if image_built && push_opted?(args)
+              if image_built && push_opted
                 push_image(config['IMAGE_NAME'])
               end
             end
 
+            puts "Installing run script"
             install_run_script(app_dir, *config.values_at('IMAGE_NAME', 'CONTAINER_NAME', 'RUN_SCRIPT', 'RUN_OPTS'))
 
             FileUtils.rm_rf(build_dir)
           end
         end
 
-        def push_opted? args
-          args.find {|a| a == '-p'}
-        end
-
-        def skip_build? args
-          args.find {|a| a == '-u'}
-        end
-
-        def check_working_dir dir
-          return if File.directory?(dir)
-          puts "#{dir} should be a directory"
-          exit 1
-        end
-
-        def check_config_file
-          return if File.file?(CONFIG_FILE)
-          puts "#{dir}/config.yml file is missing"
-          exit 1
-        end
-
         def load_config
           YAML.load(File.read(CONFIG_FILE))
         end
@@ -117,7 +97,7 @@ module Sombrero
         end
 
         def install_cleanup_file dir
-          FileUtils.cp(BASE_DIR / 'cleanup', dir / 'build')
+          FileUtils.cp(CLEANUP_FILE, dir / 'build/cleanup')
         end
 
         def prepare_build dir, app_dir

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

@@ -2,19 +2,17 @@ module Sombrero
   class CLI
     module Docker
       class Install
-        include InstallHelpers
+        include Helpers
 
-        def initialize dir
-          ensure_dirname_exists(dir)
-          assert_installable_dir(dir)
-          install(dir)
+        def initialize dir, working_dir_opted: false
+          install(dir, working_dir_opted)
+          make_executable(dir / PREPARE_BUILD_FILE)
+          puts "Done. All files installed into #{dir}"
         end
 
-        def install dir
-          src = dir.to_path == '.' ? BASE_DIR.to_path + '/skel/.' : BASE_DIR / 'skel'
+        def install dir, working_dir_opted
+          src = working_dir_opted ? BASE_DIR.to_path + '/skel/.' : BASE_DIR / 'skel'
           FileUtils.cp_r(src, dir)
-          FileUtils.chmod('+x', dir / PREPARE_BUILD_FILE)
-          puts "Done. All files installed into #{dir}"
         end
 
       end

data/lib/sombrero/cli/docker/update.rb

@@ -0,0 +1,24 @@
+module Sombrero
+  class CLI
+    module Docker
+      class Update
+        include Helpers
+
+        def initialize dir
+          Dir.chdir BASE_DIR / 'skel' do
+
+            Dir['**/*'].select {|e| File.file?(e)}.each do |file|
+              next if File.file?(dir / file)
+              create_dirname_for(dir / file)
+              puts "Installing #{File.basename(dir)}/#{file}"
+              FileUtils.cp(file, dir / file)
+            end
+
+          end
+          puts "Done"
+        end
+
+      end
+    end
+  end
+end

data/lib/sombrero/cli/docker.rb

@@ -6,9 +6,11 @@ module Sombrero
       START_FILE  = './start.sh'.freeze
       PREPARE_BUILD_FILE = './prepare_build.sh'.freeze
       BUILD_FILE = './build.sh'.freeze
+      CLEANUP_FILE = './cleanup.sh'.freeze
     end
   end
 end
 
 require 'sombrero/cli/docker/install'
 require 'sombrero/cli/docker/build'
+require 'sombrero/cli/docker/update'

data/lib/sombrero/cli/generator.rb

@@ -0,0 +1,15 @@
+module Sombrero
+  class CLI
+    class Generator
+      class API
+        include Helpers
+
+        def initialize gen_dir, api_dir, api_name
+          FileUtils.cp_r(gen_dir, api_dir)
+          puts "Done"
+        end
+
+      end
+    end
+  end
+end

data/lib/sombrero/cli/helpers.rb

@@ -0,0 +1,47 @@
+module Sombrero
+  class CLI
+    module Helpers
+
+      def display_error error
+        puts "", "\t::: #{error} :::", ""
+      end
+
+      def fatal_error! error, exit_code = 1
+        display_error(error)
+        exit exit_code
+      end
+
+      def expanded_path *path
+        Pathname.new(File.expand_path(File.join(*path.map(&:to_s))))
+      end
+
+      def create_dirname_for dir
+        FileUtils.mkdir_p(File.dirname(dir))
+      end
+
+      def make_executable *entries
+        entries.flatten.each {|e| FileUtils.chmod('+x', e)}
+      end
+
+      def working_dir_opted? opted_dir
+        opted_dir == '.'
+      end
+
+      def extract_namespace args
+        return unless index = args.index('-n')
+        return unless namespace = args[index + 1]
+        if namespace =~ /::/
+          fatal_error! "Nested namespaces not supported"
+        end
+        if namespace =~ /\W/
+          fatal_error! "Namespace may contain only alphanumerics"
+        end
+        unless namespace =~ /\A[A-Z]/
+          fatal_error! "Namespace should start with a capital letter"
+        end
+        namespace
+      end
+
+    end
+  end
+end

data/lib/sombrero/cli.rb

@@ -2,110 +2,175 @@ require 'fileutils'
 require 'pathname'
 require 'yaml'
 require 'pty'
+require 'sombrero/cli/helpers'
+require 'sombrero/cli/assertions'
 
 module Sombrero
   BASE_DIR = Pathname.new(File.expand_path('../../..', __FILE__)).freeze
 
   class CLI
-    module InstallHelpers
-
-      def ensure_dirname_exists dir
-        FileUtils.mkdir_p(File.dirname(dir))
-      end
-
-      def assert_installable_dir dir
-        if dir.to_path == '.'
-          assert_empty_dir(dir)
-        else
-          assert_dir_does_not_exists(dir)
-        end
-      end
-
-      def assert_empty_dir dir
-        return if Dir[dir / '*'].empty?
-        puts "", "\t::: #{dir} should be empty :::", ""
-        exit 1
-      end
-
-      def assert_dir_does_not_exists dir
-        return unless File.exists?(dir)
-        puts "", "\t::: #{dir} already exists :::", ""
-        exit 1
-      end
-    end
+    include Helpers
+    include Assertions
 
     def initialize args
       case command = args[0]
       when 'a', 'app'
         app(args)
+      when 'g', 'gen', 'generate'
+        generator(args)
       when 'd', 'docker'
         docker(args)
+      when nil, '-h', '--help'
+        usage
       else
-        unknown_command_error!(command)
+        display_error "Unknown command #{command}"
+        usage
       end
     end
 
-    def app args
-      missing_destination_error! unless args[2]
-      dir = Pathname.new(args[2])
 
-      case instruction = args[1]
-      when 'i', 'install'
-        App::Install.new(dir, extract_namespace(args))
-      when 'u', 'update'
-        App::Update.new(dir, args)
-      else
-        unknown_instruction_error!(instruction, 'install or (i)', 'update or (u)')
-      end
+    def usage
+      puts "
+      === Install a new app ===
+      $ sombrero [app || a] [install || i] [dir || .]
+
+      === Update existing app ===
+      $ sombrero [app || a] [update || u] [dir || .]
+
+      === Generate a new API ===
+      $ sombrero [generate || g] [api || a] [api name] [dir || .]
+
+      === Install Docker recipes ===
+      $ sombrero [docker || d] [install || i] [dir || .]
+
+      === Update Docker recipes ===
+      $ sombrero [docker || d] [update || u] [dir || .]
+
+      === Build Docker image and install run script ===
+      $ sombrero [docker || d] [build || b] [dir || .] [-u] [-p]
+      If -u option provided it will only update the run script without building the image.
+      If -p option provided it will try to push the image to Docker registry after successful build.
+
+      === Usage ===
+      $ sombrero [-h || --help]
+      ".split("\n").map {|l| "\t" + l.strip}.join("\n")
     end
 
-    def extract_namespace args
-      return unless index = args.index('-n')
-      return unless namespace = args[index + 1]
-      if namespace =~ /::/
-        puts "", "\t::: Nested namespaces not supported :::", ""
-        exit 1
+
+    begin # App
+      def app args
+        opted_dir = args[2]
+        assert_directory_provided(opted_dir)
+        dir = expanded_path(opted_dir)
+
+        case instruction = args[1]
+        when 'i', 'install'
+
+          app_install(dir, {
+            working_dir_opted: working_dir_opted?(opted_dir),
+            namespace: extract_namespace(args)
+          })
+
+        when 'u', 'update'
+
+          app_update(dir)
+
+        else
+          unknown_instruction_error!(instruction, 'install (or i)', 'update (or u)')
+        end
       end
-      if namespace =~ /\W/
-        puts "", "\t::: Namespace may contain only alphanumerics :::", ""
-        exit 1
+
+      def app_install dir, opts
+        create_dirname_for(dir)
+        assert_installable_dir(dir, opts[:working_dir_opted])
+        App::Install.new(dir, opts)
       end
-      unless namespace =~ /\A[A-Z]/
-        puts "", "\t::: Namespace should start with a capital letter :::", ""
-        exit 1
+
+      def app_update dir
+        assert_is_app_dir(dir)
+        App::Update.new(dir)
       end
-      namespace
     end
 
-    def docker args
-      missing_destination_error! unless args[2]
-      dir = Pathname.new(args[2])
 
-      case instruction = args[1]
-      when 'i', 'install'
-        Docker::Install.new(dir)
-      when 'b', 'build'
-        Docker::Build.new(dir, args)
-      else
-        unknown_instruction_error!(instruction, 'install or (i)', 'build or (b)')
+    begin # Generator
+      def generator args
+
+        case instruction = args[1]
+        when 'api', 'a'
+          api_name = args[2]
+          assert_valid_api_name_given(api_name)
+
+          app_dir = args[3]
+          assert_directory_provided(app_dir)
+          app_dir = expanded_path(app_dir)
+          assert_is_app_dir(app_dir)
+
+          gen_dir = app_dir / 'generators/api'
+          assert_directory_exists(gen_dir)
+
+          api_dir = app_dir / "base/api/#{api_name}"
+          assert_directory_does_not_exists(api_dir)
+
+          Generator::API.new(gen_dir, api_dir, api_name)
+        else
+          unknown_instruction_error!(instruction, 'api (or a)')
+        end
       end
     end
 
-    def missing_destination_error!
-      puts "", "\t::: Please provide a directory to install files into :::", ""
-      exit 1
-    end
 
-    def unknown_command_error! command, *available_commands
-      puts "", "\t::: Unknown command #{command}. Use one of #{available_commands*', '} :::", ""
-      exit 1
+    begin # Docker
+      def docker args
+        opted_dir = args[2]
+        assert_directory_provided(opted_dir)
+        dir = expanded_path(opted_dir)
+
+        case instruction = args[1]
+        when 'i', 'install'
+
+          docker_install(dir, working_dir_opted: working_dir_opted?(opted_dir))
+
+        when 'b', 'build'
+
+          docker_build(dir, {
+            update_runner_only: args.find {|a| a == '-u'},
+            push_opted: args.find {|a| a == '-p'}
+          })
+
+        when 'u', 'update'
+
+          docker_update(dir)
+
+        else
+          unknown_instruction_error!(instruction, 'install (or i)', 'build (or b)', 'update (or u)')
+        end
+      end
+
+      def docker_install dir, opts
+        create_dirname_for(dir)
+        assert_installable_dir(dir, opts[:working_dir_opted])
+        Docker::Install.new(dir, opts)
+      end
+
+      def docker_build dir, opts
+        assert_directory_exists(dir)
+        assert_config_file_exists(dir)
+        Docker::Build.new(dir, opts)
+      end
+
+      def docker_update dir
+        assert_is_docker_dir(dir)
+        Docker::Update.new(dir)
+      end
     end
 
+
     def unknown_instruction_error! instruction, *available_instructions
-      puts "", "\t::: Unknown instruction #{instruction}. Use one of #{available_instructions*', '} :::", ""
-      exit 1
+      fatal_error! "Unknown instruction #{instruction}. Use one of #{available_instructions*', '}"
     end
 
+
     def self.run cmd
       puts "", "$ #{cmd}"
       PTY.spawn cmd do |r, w, pid|
@@ -125,4 +190,5 @@ module Sombrero
 end
 
 require 'sombrero/cli/app'
+require 'sombrero/cli/generator'
 require 'sombrero/cli/docker'

data/lib/sombrero/rtcp_controller.rb

@@ -1,15 +1,3 @@
-# dirty hack until this is merged and released
-# github.com/ngauthier/tubesock/pull/50
-class Tubesock
-  def close!
-    if @socket.respond_to?(:closed?)
-      @socket.close unless @socket.closed?
-    else
-      @socket.close
-    end
-  end
-end
-
 module Sombrero
   class RTCPController < BaseController
     attr_reader :socket

data/sombrero.gemspec

@@ -3,7 +3,7 @@
 Gem::Specification.new do |spec|
   spec.name, spec.version = %w[
     sombrero
-    0.0.3
+    0.0.5
   ]
   spec.authors     = ['Slee Woo']
   spec.email       = ['mail@sleewoo.com']