hanami 0.8.0 → 0.9.0

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

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

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

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

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

@@ -1,18 +1,24 @@
-require 'hanami/commands/db/abstract'
+require 'hanami/commands/command'
 
 module Hanami
   module Commands
     class DB
-      class Migrate < Abstract
-        def initialize(environment, version)
-          super(environment)
+      class Migrate < Command
+        requires 'model.sql'
+
+        def initialize(options, version)
+          super(options)
           @version = version
         end
 
         def start
           require 'hanami/model/migrator'
-          Hanami::Model::Migrator.migrate(version: @version)
+          Hanami::Model::Migrator.migrate(version: version)
         end
+
+        private
+
+        attr_reader :version
       end
     end
   end

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

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

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

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

data/lib/hanami/commands/generate/abstract.rb

@@ -1,4 +1,5 @@
 require 'hanami/environment'
+require 'hanami/commands/command'
 require 'hanami/generators/generatable'
 require 'hanami/generators/test_framework'
 require 'hanami/generators/template_engine'
@@ -8,17 +9,19 @@ require 'hanami/utils/string'
 module Hanami
   module Commands
     class Generate
-      class Abstract
+      class Abstract < Commands::Command
 
         include Hanami::Generators::Generatable
 
         attr_reader :options, :target_path
 
         def initialize(options)
+          super
+
           @options = Hanami::Utils::Hash.new(options).symbolize!
           assert_options!
 
-          @target_path = Pathname.pwd
+          @target_path = Hanami.root
         end
 
         def template_source_path
@@ -40,11 +43,6 @@ module Hanami
           @hanamirc ||= Hanamirc.new(target_path)
         end
 
-        def environment
-          @environment ||= Hanami::Environment.new(options)
-        end
-
-
         def template_engine
           @template_engine ||= Hanami::Generators::TemplateEngine.new(hanamirc, options[:template])
         end

data/lib/hanami/commands/generate/action.rb

@@ -1,5 +1,6 @@
 require 'hanami/commands/generate/abstract'
 require 'hanami/routing/route'
+require 'hanami/utils/blank'
 
 module Hanami
   module Commands
@@ -81,6 +82,7 @@ module Hanami
           assert_application_name!
           assert_controller_class_name!
           assert_action_name!
+          assert_url!
           assert_http_method!
         end
 
@@ -167,8 +169,8 @@ module Hanami
         # @since 0.5.0
         # @api private
         def known_application_names
-          Dir.glob(applications_path.join('/*')).map do |name|
-            File.basename(name)
+          applications_path.children.map do |app|
+            ::File.basename(app)
           end
         end
 
@@ -193,8 +195,18 @@ module Hanami
         def assert_application_name!
           return unless environment.container?
           if argument_blank?(@application_name) || !application_path.exist?
-            existing_apps = known_application_names.join('/')
-            raise ArgumentError.new("Unknown app: `#{ @application_name.downcase }'. Please specify one of (#{ existing_apps }) as application name")
+            existing_apps = known_application_names.map { |name| "`#{name}'" }.join(' ')
+            warn "`#{@application_name.downcase}' is not a valid APPLICATION_NAME. Please specify one of: #{existing_apps}"
+            exit(1)
+          end
+        end
+
+        # @since 0.9.0
+        # @api private
+        def assert_url!
+          if options.key?(:url) && Hanami::Utils::Blank.blank?(options[:url])
+            warn "`#{options[:url]}' is not a valid URL"
+            exit(1)
           end
         end
 
@@ -202,8 +214,8 @@ module Hanami
         # @api private
         def assert_http_method!
           if !Hanami::Routing::Route::VALID_HTTP_VERBS.include?(http_method.upcase)
-            existing_http_methods = Hanami::Routing::Route::VALID_HTTP_VERBS
-            raise ArgumentError.new("Unknown HTTP method '#{http_method}', please use one of #{ existing_http_methods.join('/') }.")
+            warn "`#{http_method.upcase}' is not a valid HTTP method. Please use one of: #{Hanami::Routing::Route::VALID_HTTP_VERBS.map { |verb| "`#{verb}'" }.join(" ")}"
+            exit(1)
           end
         end
 

data/lib/hanami/commands/generate/app.rb

@@ -1,5 +1,6 @@
 require 'hanami/commands/generate/abstract'
 require 'hanami/application_name'
+require 'hanami/utils/blank'
 require 'securerandom'
 
 module Hanami
@@ -10,9 +11,14 @@ module Hanami
         attr_reader :base_path
 
         def initialize(options, application_name)
-          super(options)
+          @environment = Hanami::Environment.new(options)
+          @options = Hanami::Utils::Hash.new(options).symbolize!
+          assert_options!
+
+          @target_path = Hanami.root
           assert_application_name!(application_name)
           assert_architecture!
+          assert_application_base_url!
 
           @application_name = ApplicationName.new(application_name)
           @base_path = Pathname.pwd
@@ -65,7 +71,7 @@ module Hanami
         end
 
         def add_mount_app
-          generator.inject_into_file base_path.join('config/environment.rb'), after: /Hanami::Container.configure do/ do |match|
+          generator.inject_into_file base_path.join('config/environment.rb'), after: /Hanami.configure do/ do |match|
             "\n  mount #{ classified_app_name }::Application, at: '#{ application_base_url }'"
           end
         end
@@ -114,6 +120,13 @@ module Hanami
             raise ArgumentError.new('App generator is only available for container architecture.')
           end
         end
+
+        def assert_application_base_url!
+          if options.key?(:application_base_url) && Utils::Blank.blank?(options[:application_base_url])
+            warn "`' is not a valid URL"
+            exit(1)
+          end
+        end
       end
     end
   end

data/lib/hanami/commands/generate/migration.rb

@@ -1,4 +1,5 @@
 require 'hanami/commands/generate/abstract'
+require 'hanami/utils/file_list'
 
 module Hanami
   module Commands
@@ -27,7 +28,7 @@ module Hanami
           @name = name
           @underscored_name = Utils::String.new(@name).underscore
 
-          environment.require_application_environment
+          Components.resolve('model.configuration')
           assert_migration_name!
         end
 
@@ -42,7 +43,7 @@ module Hanami
         end
 
         def existing_migration_path
-          Dir.glob("#{Hanami::Model.configuration.migrations}/[0-9]*_#{underscored_name}.rb").first
+          Utils::FileList["#{Hanami::Model.configuration.migrations}/[0-9]*_#{underscored_name}.rb"].first
         end
 
         def new_migration_path

data/lib/hanami/commands/generate/model.rb

@@ -5,11 +5,12 @@ module Hanami
     class Generate
       class Model < Abstract
 
-        attr_reader :model_name
+        attr_reader :input, :model_name
 
         def initialize(options, model_name)
           super(options)
-          @model_name = Utils::String.new(model_name).classify
+          @input      = Utils::String.new(model_name).underscore
+          @model_name = Utils::String.new(@input).classify
 
           assert_model_name!
         end
@@ -88,7 +89,7 @@ module Hanami
         # @since 0.5.0
         # @api private
         def model_name_underscored
-          Utils::String.new(model_name).underscore
+          input
         end
 
         # @since 0.8.0

data/lib/hanami/commands/generate/secret_token.rb

@@ -0,0 +1,31 @@
+require 'hanami/commands/generate/abstract'
+require 'hanami/application_name'
+require 'securerandom'
+
+module Hanami
+  module Commands
+    class Generate
+      class SecretToken
+
+        def initialize(application_name)
+          @application_name = application_name
+        end
+
+        def start
+          if Hanami::Utils::Blank.blank?(@application_name)
+            puts SecureRandom.hex(32)
+          else
+            puts "Set the following environment variable to provide the secret token:"
+            puts %(#{ upcase_app_name }_SESSIONS_SECRET="#{ SecureRandom.hex(32) }")
+          end
+        end
+
+        private
+        def upcase_app_name
+          @application_name.upcase
+        end
+
+      end
+    end
+  end
+end

data/lib/hanami/commands/new/abstract.rb

@@ -4,6 +4,7 @@ require 'hanami/generators/database_config'
 require 'hanami/generators/generatable'
 require 'hanami/generators/test_framework'
 require 'hanami/generators/template_engine'
+require 'hanami/utils'
 require 'hanami/utils/hash'
 
 module Hanami
@@ -28,15 +29,15 @@ module Hanami
           assert_name!
           assert_architecture!
 
-          @hanami_model_version = '~> 0.6'
+          @hanami_model_version = '~> 0.7'
           @database_config = Hanami::Generators::DatabaseConfig.new(options[:database], project_name)
           @test_framework = Hanami::Generators::TestFramework.new(hanamirc, @options[:test])
           @template_engine = Hanami::Generators::TemplateEngine.new(hanamirc, @options[:template])
         end
 
         def start
-          FileUtils.mkdir_p(project_name)
-          Dir.chdir(project_name) do
+          FileUtils.mkdir_p(project_directory)
+          Dir.chdir(project_directory) do
             @target_path = Pathname.pwd
 
             super
@@ -62,7 +63,7 @@ module Hanami
         def add_git_templates
           return if git_dir_present?
 
-          source = database_config.filesystem? ? 'gitignore_with_db.tt' : 'gitignore.tt'
+          source = database_config.sqlite? ? 'gitignore_with_sqlite.tt' : 'gitignore.tt'
           target = '.gitignore'
           add_mapping(source, target)
         end
@@ -75,6 +76,10 @@ module Hanami
           ApplicationName.new(real_project_name)
         end
 
+        def project_directory
+          @name == '.' ? '.' : project_name
+        end
+
         def target
           Pathname.new('.')
         end
@@ -90,13 +95,17 @@ module Hanami
         end
 
         def hanami_version
-          "~> #{Hanami::VERSION.scan(/\A\d{1,2}\.\d{1,2}/).first}"
+          Hanami::Version.gem_requirement
         end
 
         def hanami_head?
           options.fetch(:hanami_head, false)
         end
 
+        def code_reloading?
+          !Hanami::Utils.jruby?
+        end
+
         def architecture
           options.fetch(:architecture, DEFAULT_ARCHITECTURE)
         end

data/lib/hanami/commands/new/container.rb

@@ -20,6 +20,7 @@ module Hanami
           {
             project_name:         project_name,
             hanami_head:          hanami_head?,
+            code_reloading:       code_reloading?,
             test:                 test_framework.framework,
             database:             database_config.type,
             database_config:      database_config.to_hash,

data/lib/hanami/commands/routes.rb

@@ -1,3 +1,5 @@
+require 'hanami/commands/command'
+
 module Hanami
   module Commands
     # Display application/container routes.
@@ -8,33 +10,14 @@ module Hanami
     #
     # @since 0.1.0
     # @api private
-    class Routes
-      # @param options [Hash] Environment's options
-      #
-      # @since 0.1.0
-      # @see Hanami::Environment#initialize
-      def initialize(options)
-        @environment = Hanami::Environment.new(options)
-        @environment.require_application_environment
-      end
+    class Routes < Command
+      requires 'routes.inspector'
 
       # Display to STDOUT application routes
       #
       # @since 0.1.0
       def start
-        puts app.routes.inspector.to_s
-      end
-
-      private
-
-      # @since 0.1.0
-      # @api private
-      def app
-        if @environment.container?
-          Hanami::Container.new
-        else
-          Hanami::Application.applications.first.new
-        end
+        puts requirements['routes.inspector'].inspect
       end
     end
   end

data/lib/hanami/commands/server.rb

@@ -1,156 +1,28 @@
-require 'rack'
-require 'hanami/server'
+require 'hanami/commands/command'
 
 module Hanami
   module Commands
-    class Server
-
-      # Message text when Shotgun enabled but interpreter does not support `fork`
-      #
-      # @since 0.8.0
-      # @api private
-      WARNING_MESSAGE = 'Your platform doesn\'t support code reloading.'.freeze
-
-      ENTR_EXECUTE_COMMAND = "find %{paths} -type f | entr -r bundle exec hanami rackserver %{args}".freeze
-
-      attr_reader :server
+    # Server command (`hanami server`)
+    #
+    # @since 0.1.0
+    # @api private
+    class Server < Command
+      requires 'code_reloading'
 
       def initialize(options)
-        @options = options
-        detect_strategy!
-        prepare_server!
-      end
-
-      def start
-        preload_applications!
-
-        case @strategy
-        when :entr
-          exec ENTR_EXECUTE_COMMAND % {paths: project_paths, args: server_options}
-        when :shotgun
-          Shotgun.enable_copy_on_write
-          Shotgun.preload
-          @server.start
-        when :rackup
-          @server.start
-        end
-      end
-
-      private
-
-      def server_options
-        _options = @options.dup
-        _options.delete(:code_reloading)
-        _options.inject([]) {|res, (k, v)| res << "--#{k}=#{v}" ; res}.join(" ")
-      end
-
-      def project_paths
-        applications = Hanami::Environment.new.container? ? 'apps' : 'app'
-        "#{ applications } config db lib"
-      end
-
-      def prepare_server!
-        case @strategy
-        when :rackup
-          @server = Hanami::Server.new(@options)
-        when :shotgun
-          @server = Hanami::Server.new(@options)
-          @server.app = Shotgun::Loader.new(@server.rackup_config)
-        end
-      end
-
-      # Determine server strategy
-      #
-      # In order to decide the value, it looks up the following sources:
-      #
-      #   * CLI option `code_reloading`
-      #
-      # If those are missing it falls back to the following defaults:
-      #
-      #   * :shotgun for development and if Shotgun enabled and `fork supported
-      #   * :entr for development and Shotgun disabled but `entr` installed
-      #   * :rackup for all other cases
-      #
-      # @return [:shotgun,:entr, :rackup] the result of the check
-      #
-      # @since 0.8.0
-      #
-      # @see Hanami::Environment::CODE_RELOADING
-      def detect_strategy!
-        @strategy = :rackup
-        if Hanami::Environment.new(@options).code_reloading?
-          if shotgun_enabled?
-            if fork_supported?
-              @strategy = :shotgun
-            else
-              puts WARNING_MESSAGE
-            end
-          elsif entr_enabled?
-            @strategy = :entr
-          end
-        end
+        super(options)
 
-        @strategy
+        require 'hanami/server'
+        @server = Hanami::Server.new
       end
 
-      def preload_applications!
-        Hanami::Environment.new(@options).require_application_environment
-        Hanami::Application.preload!
-      end
-
-      # Check if entr(1) is installed
-      #
-      # @return [Boolean]
-      #
-      # @since 0.8.0
-      # @api private
-      def entr_enabled?
-        !!which('entr')
-      end
-
-
-      # Check if Shotgun is enabled
-      #
-      # @return [Boolean]
-      #
-      # @since 0.8.0
-      # @api private
-      def shotgun_enabled?
-        begin
-        require 'shotgun'
-        true
-        rescue LoadError
-          false
-        end
+      def start
+        server.start
       end
 
-      # Check if ruby interpreter supports `fork`
-      #
-      # @return [Boolean]
-      #
-      # @since 0.8.0
-      # @api private
-      def fork_supported?
-        Kernel.respond_to?(:fork)
-      end
+      protected
 
-      # Cross-platform way of finding an executable in the $PATH.
-      #
-      # Usage:
-      #   which('ruby') #=> /usr/bin/ruby
-      #
-      # @since 0.8.0
-      # @api private
-      def which(cmd)
-        exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
-        ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
-          exts.each { |ext|
-            exe = File.join(path, "#{cmd}#{ext}")
-            return exe if File.executable?(exe) && !File.directory?(exe)
-          }
-        end
-        return nil
-      end
+      attr_reader :server
     end
   end
 end