isomorfeus-installer 1.0.0.delta3 → 1.0.0.delta4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 021452c39288a477336e084326e6cee2d18d21665f0672a52dece9ae5330e416
-  data.tar.gz: 85ac2153a47d6a5efc9d31349cdd0ebb577d42d5539c89e1e7005409370b3a21
+  metadata.gz: a9f3de9a3999445ae6d8e6a83ac0a3ee219d248bd7ba35d53aae9e7dbb12e044
+  data.tar.gz: 8d7556c94f6e1fdabb7fad5006d9f2e81303b278e9a23eae0c378e3468b1e7fe
 SHA512:
-  metadata.gz: fc9f0216257a00279cfd4631b60db3cd8e8e6a7fe8855e891a4da260e95388b59a93478cc57e193a0e4ba73cebd9435af54094921ff1a3ad76fc8afc4336d0b0
-  data.tar.gz: addf109c72a42ecb439c7e7183508bb2e040d8a34e2cdc2c1433aba7508bc952b145501edacd7dce9923e2b23659211715cd28e4c66929e8babc61fea972dada
+  metadata.gz: 5c2f308f17c9857a689f7b86188fd4831407c65f4dda6f307cbb1de4a1e167ba6428ca3b915bfc2c6c7c0702e28d911ce212e281596079909a9cf0dbba41c00b
+  data.tar.gz: 57b6e511e8bb7d744efad79be36ee95b347dd05bbc7e7336b0fb5748d4822dfee36a2f7fc0e786f33cf143e86bf5d6f6d2a66ae0db689525b1dcf75ec18915d0

data/bin/yandle

@@ -0,0 +1,9 @@
+#!/usr/bin/env ruby
+
+if %w[update upgrade].include?(ARGV[0])
+  system('yarn upgrade')
+  system('bundle update')
+else
+  system('yarn install')
+  system('bundle install')
+end

data/lib/isomorfeus/installer/cli.rb

@@ -10,16 +10,16 @@ module Isomorfeus
       option :operation, default: false, type: :boolean, aliases: '-o', desc: "Use operation module. (optional, requires transport)"
       option :policy, default: false, type: :boolean, aliases: '-p', desc: "Use policy module. (optional, requires transport)"
       option :rack_server, default: 'puma', aliases: '-r',
-             desc: "Select rack server, one of: #{Isomorfeus::Installer.sorted_rack_servers.join(', ')}. (optional, default: puma)"
+             desc: "Select rack server, one of: #{Isomorfeus::Installer.sorted_rack_servers.join(', ')}. (optional)"
       option :transport, required: false, aliases: '-t',
              desc: "Select transport, one of: #{Isomorfeus::Installer.sorted_transports.join(', ')}. (optional if no other features that depend on a transport are used)"
       option :transport_store, required: false, aliases: '-e',
              desc: "Select transport store, one of: #{Isomorfeus::Installer.sorted_transport_stores.join(', ')}. (optional with no transport, required if a transport is used)"
-
+      option :yarn_and_bundle, default: true, required: false, type: :boolean, aliases: '-y', desc: "Execute yarn install and bundle install. (optional)"
       def new(project_name)
         Isomorfeus::Installer.set_project_names(project_name)
         Isomorfeus::Installer.options = options
-        Isomorfeus::Installer::NewProject.execute
+        Isomorfeus::Installer::NewProject.execute(yarn_and_bundle: options[:yarn_and_bundle])
       end
     end
   end

data/lib/isomorfeus/installer/new_project.rb

@@ -10,12 +10,12 @@ module Isomorfeus
         Isomorfeus::Installer
       end
 
-      def self.execute
+      def self.execute(yarn_and_bundle: true)
         begin
-          Dir.mkdir(installer.project_name)
-          Dir.chdir(installer.project_name)
+          Dir.mkdir(installer.project_dir)
+          Dir.chdir(installer.project_dir)
         rescue
-          puts "Directory #{installer.project_name} could not be created!"
+          puts "Directory #{installer.project_dir} could not be created!"
           exit 1
         end
 
@@ -41,8 +41,12 @@ module Isomorfeus
           Isomorfeus::Installer.create_gemfile
           Isomorfeus::Installer.create_procfile
 
-          `bundle install`
-          `yarn install`
+          if yarn_and_bundle
+            puts 'Executing yarn install:'
+            system('yarn install')
+            puts 'Executing bundle install:'
+            system('bundle install')
+          end
 
           Dir.chdir('..')
           puts 'Installation finished, make your dreams come true :)'

data/lib/isomorfeus/installer/options_mangler.rb

@@ -40,6 +40,7 @@ module Isomorfeus
 
         if options.key?(:rack_server) && installer.sorted_rack_servers.include?(options[:rack_server])
           installer.rack_server = installer.rack_servers[options[:rack_server]]
+          installer.rack_server_name = options[:rack_server]
         else
           installer.rack_server = installer.rack_servers['puma']
         end

data/lib/isomorfeus/installer/rack_servers.rb

@@ -9,7 +9,7 @@ Isomorfeus::Installer.add_rack_server('falcon', {
 })
 
 Isomorfeus::Installer.add_rack_server('iodine', {
-  gems: [ { name: 'falcon', version: "~> 0.7.31", require: false } ],
+  gems: [ { name: 'iodine', version: "~> 0.7.31", require: false } ],
   start_command: 'bundle exec iodine'
 })
 

data/lib/isomorfeus/installer/templates/Gemfile.erb

@@ -8,11 +8,11 @@ gem 'roda', '~> 3.19.0'
 
 gem 'opal', github: 'janbiedermann/opal', branch: 'es6_modules_1_1'
 gem 'opal-activesupport', github: 'janbiedermann/opal-activesupport', branch: 'relax'
-gem 'opal-webpack-loader', '~> 0.8.3'
+gem 'opal-webpack-loader', '~> 0.8.4'
 
 gem 'opal-autoloader', '~> 0.0.3'
-gem 'isomorfeus-redux', '~> 4.0.2'
-gem 'isomorfeus-react', '~> 16.6.3'
+gem 'isomorfeus-redux', '~> 4.0.3'
+gem 'isomorfeus-react', '~> 16.6.6'
 #<%= transport_gems %>
 #<%= database_gems %>
 #<%= policy_gems %>
@@ -21,5 +21,5 @@ gem 'isomorfeus-react', '~> 16.6.3'
 
 group :test do
   gem 'rspec', '~> 3.6.0'
-  gem 'isomorfeus-puppetmaster', '~> 0.2.2'
+  gem 'isomorfeus-puppetmaster', '~> 0.2.7'
 end

data/lib/isomorfeus/installer/templates/package.json.erb

@@ -2,7 +2,7 @@
   "name": "<%= application_name %>",
   "private": true,
   "dependencies": {
-    "opal-webpack-loader": "^0.8.3",
+    "opal-webpack-loader": "^0.8.4",
     "react": "16.6",
     "react-dom": "16.6",
     "react-router": "^4.3.1",

data/lib/isomorfeus/installer/templates/spec_helper.rb.erb

@@ -10,6 +10,7 @@ ASSETS_COMPILED ||= `yarn run production_build`
 
 Isomorfeus::Puppetmaster.download_path = File.join(Dir.pwd, 'download_path_tmp')
 Isomorfeus::Puppetmaster.driver = :chromium
+Isomorfeus::Puppetmaster.server = :<%= rack_server %>
 Isomorfeus::Puppetmaster.app = <%= app_class %>
 Isomorfeus::Puppetmaster.boot_app
 

data/lib/isomorfeus/installer/version.rb

@@ -1,5 +1,5 @@
 module Isomorfeus
   module Installer
-    VERSION = '1.0.0.delta3'
+    VERSION = '1.0.0.delta4'
   end
 end

data/lib/isomorfeus/installer.rb

@@ -40,9 +40,11 @@ module Isomorfeus
       attr_accessor :i18n
       attr_accessor :operation
       attr_accessor :policy
+      attr_reader   :project_dir
       attr_reader   :project_env
       attr_reader   :project_name
       attr_accessor :rack_server
+      attr_accessor :rack_server_name
       attr_accessor :transport
       attr_accessor :transport_store
 
@@ -50,17 +52,17 @@ module Isomorfeus
       attr_reader :options
     end
 
-    def self.set_project_names(pro_name)
-      @project_name   = pro_name.underscore
-      @app_class      = pro_name.camelize + 'App'
-      @app_require    = pro_name.underscore + '_app'
-      @component_name = pro_name.camelize + 'Component'
-      @project_env    = pro_name.underscore.upcase + '_ENV'
+    def self.set_project_names(pro_dir)
+      @project_dir    = pro_dir
+      @project_name   = pro_dir.underscore
+      @app_class      = @project_name.camelize + 'App'
+      @app_require    = @project_name + '_app'
+      @component_name = @app_class + 'Component'
+      @project_env    = @project_name.upcase + '_ENV'
     end
 
     def self.options=(options)
       Isomorfeus::Installer::OptionsMangler.mangle_options(options)
-      puts "options: #{options}"
       @options = options
     end
 
@@ -180,6 +182,7 @@ module Isomorfeus
       unless Dir.exist?(directory)
         puts "Creating directory #{directory}."
         FileUtils.mkdir_p(directory)
+        FileUtils.touch(File.join(directory, '.keep'))
       end
     end
 
@@ -307,7 +310,7 @@ module Isomorfeus
     end
 
     def self.create_spec
-      data_hash = { app_class: app_class, app_require: app_require, project_env: project_env }
+      data_hash = { app_class: app_class, app_require: app_require, project_env: project_env, rack_server: rack_server_name }
       create_file_from_template('spec_helper.rb.erb', File.join('spec', 'spec_helper.rb'), data_hash)
       create_file_from_template('test_spec.rb.erb', File.join('spec', 'test_spec.rb'), {})
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-installer
 version: !ruby/object:Gem::Version
-  version: 1.0.0.delta3
+  version: 1.0.0.delta4
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-22 00:00:00.000000000 Z
+date: 2019-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -126,11 +126,13 @@ description: Create new isomorfeus-framework applications with ease.
 email: jan@kursator.de
 executables:
 - isomorfeus
+- yandle
 extensions: []
 extra_rdoc_files: []
 files:
 - LICENSE
 - bin/isomorfeus
+- bin/yandle
 - lib/isomorfeus/installer.rb
 - lib/isomorfeus/installer/cli.rb
 - lib/isomorfeus/installer/databases/arangodb.rb