hanami 0.8.0 → 0.9.0

data/lib/hanami/application_name.rb

@@ -30,7 +30,7 @@ module Hanami
     #
     # @since 0.2.1
     def initialize(name)
-      @name = sanitize(name)
+      @name = sanitize(name.to_s)
       ensure_validity!
     end
 
@@ -98,7 +98,7 @@ module Hanami
     def sanitize(name)
       Utils::String.new(
         name.strip
-      ).underscore.to_s
+      ).namespace.underscore.to_s
     end
   end
 end

data/lib/hanami/application_namespace.rb

@@ -0,0 +1,12 @@
+require 'hanami/utils/class'
+require 'hanami/utils/string'
+
+module Hanami
+  class ApplicationNamespace
+    def self.resolve(name)
+      Utils::Class.load!(
+        Utils::String.new(name).namespace
+      )
+    end
+  end
+end

data/lib/hanami/assets/asset.rb

@@ -1,3 +1,5 @@
+require 'hanami/utils/file_list'
+
 module Hanami
   module Assets
     # Requested asset
@@ -60,7 +62,7 @@ module Hanami
       # @since 0.8.0
       # @api private
       def find_asset
-        Dir[PUBLIC_DIRECTORY].find do |asset|
+        Utils::FileList[PUBLIC_DIRECTORY].find do |asset|
           yield asset unless ::File.directory?(asset)
         end
       end

data/lib/hanami/assets/static.rb

@@ -11,7 +11,7 @@ require 'hanami/assets/asset'
 
 module Hanami
   module Assets
-    # Serve static assets in development enviroments (development, test).
+    # Serve static assets in development environments (development, test).
     #
     # While serving static assets is a role delegated in production to web
     # servers (like Nginx), in development it's rare to use a web server.
@@ -92,17 +92,11 @@ module Hanami
       # @since 0.8.0
       # @api private
       def _sources_from_applications
-        Hanami::Application.applications.each_with_object({}) do |application, result|
-          config = _assets_configuration(application)
+        Hanami::Components.resolve('apps.assets.configurations')
+        Hanami::Components['apps.assets.configurations'].each_with_object({}) do |config, result|
           result["#{config.prefix}/"] = config
         end
       end
-
-      # @since 0.8.0
-      # @api private
-      def _assets_configuration(application)
-        application.configuration.namespace::Assets.configuration
-      end
     end
   end
 end

data/lib/hanami/cli.rb

@@ -85,16 +85,16 @@ module Hanami
       end
     end
 
-    desc 'new APPLICATION_NAME', 'Generate a new hanami project'
+    desc 'new PROJECT_NAME', 'Generate a new hanami project'
     long_desc <<-EOS
-      `hanami new` creates a new hanami project.
-      You can specify various options such as the database to be used as well as the path and architecture.
+`hanami new` creates a new hanami project.
+You can specify various options such as the database to be used as well as the path and architecture.
 
-      $ > hanami new fancy_app --application_name=admin
+$ > hanami new fancy_app --application_name=admin
 
-      $ > hanami new fancy_app --arch=app
+$ > hanami new fancy_app --arch=app
 
-      $ > hanami new fancy_app --hanami-head=true
+$ > hanami new fancy_app --hanami-head=true
     EOS
     method_option :database, aliases: ['-d', '--db'], desc: "Application database (#{Hanami::Generators::DatabaseConfig::SUPPORTED_ENGINES.keys.join('/')})", default: Hanami::Generators::DatabaseConfig::DEFAULT_ENGINE
     method_option :architecture, aliases: ['-a', '--arch'], desc: 'Project architecture (container/app)', default: Hanami::Commands::New::Abstract::DEFAULT_ARCHITECTURE
@@ -104,9 +104,12 @@ module Hanami
     method_option :test, desc: "Project test framework (#{Hanami::Generators::TestFramework::VALID_FRAMEWORKS.join('/')})", default: Hanami::Hanamirc::DEFAULT_TEST_SUITE
     method_option :hanami_head, desc: 'Use hanami HEAD (true/false)', type: :boolean, default: false
     method_option :help, desc: 'Displays the usage method'
-    def new(application_name)
+    def new(application_name=nil)
       if options[:help]
         invoke :help, ['new']
+      elsif application_name.nil?
+        warn %(`hanami new` was called with no arguments\nUsage: `hanami new PROJECT_NAME`)
+        exit(1)
       elsif options[:architecture] == 'app'
         Hanami::Commands::New::App.new(options, application_name).start
       else

data/lib/hanami/cli_sub_commands/assets.rb

@@ -15,15 +15,7 @@ module Hanami
       desc 'precompile', 'Precompile assets for deployment'
       def precompile
         require 'hanami/commands/assets/precompile'
-        Hanami::Commands::Assets::Precompile.new(options, environment).start
-      end
-
-      private
-
-      # @since 0.6.0
-      # @api private
-      def environment
-        Hanami::Environment.new(options)
+        Hanami::Commands::Assets::Precompile.new(options).start
       end
     end
   end

data/lib/hanami/cli_sub_commands/generate.rb

@@ -123,6 +123,22 @@ module Hanami
           Hanami::Commands::Generate::App.new(options, application_name).start
         end
       end
+
+      desc 'secret APPLICATION_NAME', 'Print a fresh secret token for production'
+      long_desc <<-EOS
+        `hanami generate secret` prints a new secret for a given app
+
+        > $ hanami generate secret web
+
+      EOS
+      def secret(application_name = nil)
+        if options[:help]
+          invoke :help, ['secret']
+        else
+          require 'hanami/commands/generate/secret_token'
+          Hanami::Commands::Generate::SecretToken.new(application_name).start
+        end
+      end
     end
   end
 end

data/lib/hanami/commands/apps.rb

@@ -0,0 +1,4 @@
+module Hanami
+  module Components
+  end
+end

data/lib/hanami/commands/assets/precompile.rb

@@ -1,33 +1,20 @@
 require 'hanami/assets'
+require 'hanami/commands/command'
 
 module Hanami
   module Commands
     class Assets
-      class Precompile
-        def initialize(options, environment)
-          @options     = options
-          @environment = environment
-        end
+      class Precompile < Command
+        requires 'apps.assets.configurations'
 
         def start
-          preload_applications
-          precompile
+          Hanami::Assets.precompile(configurations)
         end
 
         private
 
-        def preload_applications
-          @environment.require_application_environment
-
-          if @environment.container?
-            Hanami::Container.new
-          else
-            Hanami::Application.preload!
-          end
-        end
-
-        def precompile
-          Hanami::Assets.deploy
+        def configurations
+          requirements['apps.assets.configurations']
         end
       end
     end

data/lib/hanami/commands/command.rb

@@ -0,0 +1,64 @@
+require 'hanami'
+require 'hanami/environment'
+require 'hanami/components'
+require 'concurrent'
+
+module Hanami
+  module Commands
+    # Abstract command
+    #
+    # @since 0.9.0
+    class Command
+      def self.inherited(component)
+        super
+
+        component.class_eval do
+          @_requirements = Concurrent::Array.new
+          extend ClassMethods
+        end
+      end
+
+      # Class level interface
+      #
+      # @since 0.9.0
+      module ClassMethods
+        def register_as(name)
+          Hanami::Components.register(name, self)
+        end
+
+        def requires(*names)
+          requirements.concat(names)
+        end
+
+        def requirements
+          @_requirements
+        end
+      end
+
+      # @param options [Hash] Environment's options
+      #
+      # @since 0.9.0
+      def initialize(options)
+        @environment = Hanami::Environment.new(options)
+        @environment.require_project_environment
+        @configuration = Hanami.configuration
+
+        requirements.resolved('environment', environment)
+        requirements.resolve(self.class.requirements)
+      end
+
+      private
+
+      # @since 0.9.0
+      attr_reader :environment
+
+      # @since 0.9.0
+      attr_reader :configuration
+
+      # @since 0.9.0
+      def requirements
+        Hanami::Components
+      end
+    end
+  end
+end

data/lib/hanami/commands/console.rb

@@ -1,3 +1,5 @@
+require 'hanami/commands/command'
+
 module Hanami
   module Commands
     # REPL that supports different engines.
@@ -8,14 +10,24 @@ module Hanami
     #
     # @since 0.1.0
     # @api private
-    class Console
-      module Methods
+    class Console < Command
+      requires 'all'
+
+      # Implements console code reloading
+      #
+      # @since 0.2.0
+      module CodeReloading
+        # @since 0.2.0
         def reload!
           puts 'Reloading...'
-          Kernel.exec "#{$0} console"
+          Kernel.exec "#{$PROGRAM_NAME} console"
         end
       end
 
+      # Supported engines
+      #
+      # @since 0.2.0
+      # @api private
       ENGINES = {
         'pry'  => 'Pry',
         'ripl' => 'Ripl',
@@ -32,20 +44,14 @@ module Hanami
       # @since 0.1.0
       # @see Hanami::Environment#initialize
       def initialize(options)
-        @environment = Hanami::Environment.new(options)
-        @options     = @environment.to_options
+        super(options)
+
+        @options = @environment.to_options
       end
 
       # @since 0.1.0
       def start
-        # Clear out ARGV so Pry/IRB don't attempt to parse the rest
-        ARGV.shift until ARGV.empty?
-        @environment.require_application_environment
-
-        # Add convenience methods to the main:Object binding
-        TOPLEVEL_BINDING.eval('self').send(:include, Methods)
-
-        load_application
+        prepare
         engine.start
       end
 
@@ -57,6 +63,16 @@ module Hanami
 
       private
 
+      # @since 0.9.0
+      # @api private
+      def prepare
+        # Clear out ARGV so Pry/IRB don't attempt to parse the rest
+        ARGV.shift until ARGV.empty?
+
+        # Add convenience methods to the main:Object binding
+        TOPLEVEL_BINDING.eval('self').__send__(:include, CodeReloading)
+      end
+
       # @since 0.1.0
       # @api private
       def engine_lookup
@@ -65,26 +81,21 @@ module Hanami
 
       # @since 0.1.0
       # @api private
+      #
+      # rubocop:disable Lint/HandleExceptions
+      # rubocop:disable Lint/EnsureReturn
       def load_engine(engine)
         require engine
       rescue LoadError
       ensure
         return Object.const_get(
-          ENGINES.fetch(engine) {
-            raise ArgumentError.new("Unknown console engine: #{ engine }")
-          }
+          ENGINES.fetch(engine) do
+            raise ArgumentError.new("Unknown console engine: `#{engine}'")
+          end
         )
       end
-
-      # @since 0.1.0
-      # @api private
-      def load_application
-        if @environment.container?
-          Hanami::Container.new
-        else
-          Hanami::Application.preload_applications!
-        end
-      end
+      # rubocop:enable Lint/EnsureReturn
+      # rubocop:enable Lint/HandleExceptions
     end
   end
 end

data/lib/hanami/commands/db/apply.rb

@@ -1,9 +1,11 @@
-require 'hanami/commands/db/abstract'
+require 'hanami/commands/command'
 
 module Hanami
   module Commands
     class DB
-      class Apply < Abstract
+      class Apply < Command
+        requires 'model.sql'
+
         def start
           require 'hanami/model/migrator'
           Hanami::Model::Migrator.apply

data/lib/hanami/commands/db/console.rb

@@ -1,48 +1,32 @@
 require 'hanami/utils/class'
-require 'hanami/commands/db/abstract'
+require 'hanami/commands/command'
 
 module Hanami
   module Commands
     class DB
-      class Console < Abstract
-        attr_reader :name, :env_options
+      class Console < Command
+        requires 'model.sql'
 
         def initialize(options, name)
           super(options)
-          @name        = name
-          @env_options = environment.to_options
+          @name = name
         end
 
         def start
-          exec connection_string
+          exec console.connection_string
         end
 
         private
 
-        def config
-          if name
-            app_constant = Hanami::Utils::Class.load_from_pattern!(Hanami::Utils::String.new(name).classify)
-            Hanami::Utils::Class.load_from_pattern!("#{app_constant}::Application").load!
-            Hanami::Utils::Class.load_from_pattern!("#{app_constant}::Model").configuration
-          else
-            Hanami::Model.configuration
-          end
-        end
-
-        def adapter_config
-          config.adapter_config
-        end
-
-        def mapper
-          config.mapper
-        end
+        attr_reader :name
 
-        def adapter_class
-          Hanami::Utils::Class.load_from_pattern!(adapter_config.class_name, Hanami::Model::Adapters)
+        def configuration
+          Hanami::Components['model.configuration']
         end
 
-        def connection_string
-          adapter_class.new(mapper, adapter_config.uri).connection_string
+        def console
+          require 'hanami/model/sql/console'
+          Hanami::Model::Sql::Console.new(configuration.url)
         end
       end
     end