r5 0.1.9 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2fe3c1fe8a3497514c1d369f89be7da8b55468e
-  data.tar.gz: aabe9cee584561fa57c95ee7f394ac96acf3ec4c
+  metadata.gz: 540310d5e44333f1a92160ada5a8fdbafec7ec04
+  data.tar.gz: aaab7f612363a6fde3bda0dcc2838a0e484a08b4
 SHA512:
-  metadata.gz: 18d6d0d4d57bfe75621159002b6f01a69644eab0d74ad440ddb43a4d8a6ccca462da3a040ae5ec9ae077e115fc0acf9cad3cf8ca101ea329af0f33db35098663
-  data.tar.gz: 78a1d9ef28d78aa75037f2d361d064f500b805e4fd03da5429238871476504dd93fc979726919fb7c214af52ee31841bb7ecbfcc0b99ebb8effb7737d74144d7
+  metadata.gz: fc37c68af76f13eb3b640db5a9cc77f8350e0f964005d9c9c25e39861cd5fb65ef78ed7586093bb2515830eca752c29c6b2354cafd3d9a1c925635343cfac259
+  data.tar.gz: 0b298151bfdabdb627dc7459e1fd391ea480b7d55a597a173604b5e1d627762d2828ad99a4b3f041a5b9e3ecb5cb627eaeffefd16d659b7cec1b6de0a32d9b3b

data/lib/r5/config.rb

@@ -2,6 +2,20 @@ require 'yaml'
 
 class Config
 
+  REQUIRED_STRUCTURE = {'mysql' => {'user' => 'name',
+                                    'password' => 'password',
+                                    'host' => 'localhost'},
+                        'admin' => {'login' => 'admin',
+                                    'password' => 'password',
+                                    'email' => 'admin@example.com',
+                                    'lastname' => 'administrator'},
+                        'notifier' => {'email' => 'code@example.com'},
+                        'server' => {'name_prod' => 'production server',
+                                     'name_stage' => 'stage server',
+                                     'port' => 'ssh port',
+                                     'user' => 'user name'}
+  }
+
   def self.settings
     if File.exists? "#{ENV['HOME']}/.r5.yml"
       YAML::load_file("#{ENV['HOME']}/.r5.yml")
@@ -9,4 +23,14 @@ class Config
       'You need to create ~/.r5.yml file, check github for example.'
     end
   end
+
+
+  # TODO Space for improving structure check - now it is very simple and won't work properly for duplicated keys in deeper structure
+  def self.check_settings
+    all_keys(REQUIRED_STRUCTURE) - all_keys(settings)
+  end
+
+  def self.all_keys(hash)
+    hash.flat_map { |k, v| [k] + (v.is_a?(Hash) ? all_keys(v) : []) }
+  end
 end

data/lib/r5/installations/default.rb

@@ -1,8 +1,8 @@
 # DEFAULT SETTINGS
-# TODO check ruby version on system and use it in ruby version
 copy '.ruby-version'
+gsub_file "#{@project_path}/.ruby-version", /version/, RUBY_VERSION
 apply 'recipes/gemfile.rb'
-run 'bundle install'
+run 'bundle check && bundle install'
 
 copy 'config/initializers/html_helpers.rb'
 copy 'config/locales/cs.yml'

data/lib/r5/recipes/bootstrap.rb

@@ -1,7 +1,7 @@
 add_gem 'bootstrap-generators'
 add_gem 'bootstrap-select-rails'
 add_gem 'scrollbar-rails'
-run 'bundle install'
+run 'bundle check && bundle install'
 # TODO removing is probably not good idea when adding bootstrap to existing project
 remove 'app/views/layouts/application.html.erb'
 system "rails generate bootstrap:install"

data/lib/r5/recipes/devise.rb

@@ -2,7 +2,7 @@
 # TODO add checking for existing devise in project
 add_gem 'devise'
 
-run 'bundle install'
+run 'bundle check && bundle install'
 run 'rails g devise:install'
 run 'rails g devise User'
 

data/lib/r5/recipes/exception_notification.rb

@@ -1,6 +1,6 @@
 add_gem 'exception_notification'
 
-run 'bundle install'
+run 'bundle check && bundle install'
 
 config_file = "#{@project_path}/config/initializers/exception_notification.rb"
 

data/lib/r5/recipes/gitignore.rb

@@ -4,5 +4,7 @@ append_to_file "#{@project_path}/.gitignore" do
 /log/*.log
 /tmp
 /db/schema.rb
+.ruby-version
+Gemfile.lock
 EOF
 end

data/lib/r5/recipes/lazy_high_charts.rb

@@ -1,6 +1,6 @@
 # TODO check for existence of it
 add_gem 'lazy_high_charts'
-run 'bundle install'
+run 'bundle check && bundle install'
 insert_into_file "#{@project_path}/app/assets/javascripts/application.js",
                  after: "//= require_tree .\n" do
   <<EOF

data/lib/r5/recipes/upload_app.rb

@@ -4,6 +4,7 @@ copy path
 
 gsub_file upload_file, 'USER_NAME', Config.settings['server']['user']
 gsub_file upload_file, 'PORT_NUMBER', Config.settings['server']['port']
-gsub_file upload_file, 'SERVER_NAME', Config.settings['server']['name']
+gsub_file upload_file, 'PROD_SERVER', Config.settings['server']['name_prod']
+gsub_file upload_file, 'STAGE_SERVER', Config.settings['server']['name_stage']
 
 

data/lib/r5/recipes/wicked_pdf.rb

@@ -4,32 +4,10 @@ return say('Wicked_pdf already installed', :red) if File.exists?(wicked_pdf_conf
 
 add_gem 'wicked_pdf'
 add_gem 'wkhtmltopdf-binary'
-run 'bundle install'
+run 'bundle check && bundle install'
 run 'rails generate wicked_pdf'
 
-
-insert_into_file wicked_pdf_conf,
-                 after: "# https://github.com/mileszs/wicked_pdf/blob/master/README.md\n" do
-<<RUBY
-require 'wicked_pdf'
-require 'rbconfig'
-
-if RbConfig::CONFIG['host_os'] =~ /linux/
-  arch = RbConfig::CONFIG['host_cpu'] == 'x86_64' ? 'wkhtmltopdf_linux_x64' : 'wkhtmltopdf_linux_386'
-elsif RbConfig::CONFIG['host_os'] =~ /darwin/
-  arch = 'wkhtmltopdf_darwin_386'
-else
-  raise "Invalid platform. Must be running Intel-based Linux or OSX."
-end
-RUBY
-end
-
-
-gsub_file wicked_pdf_conf, "# exe_path: Gem.bin_path('wkhtmltopdf-binary', 'wkhtmltopdf')" do
-<<RUBY
-    exe_path: "\#{ENV['GEM_HOME']}/gems/wkhtmltopdf-binary-\#{Gem.loaded_specs['wkhtmltopdf-binary'].version}/bin/\#{arch}"
-RUBY
-
-end
+say "CHECK https://github.com/mileszs/wicked_pdf", :green
+say "For server - find binary with which wkhtmltopdf and used it as exe_path in config/initializers/wicked_pdf.rb", :red
 
 

data/lib/r5/recipes/xlsx_support.rb

@@ -1,6 +1,6 @@
 add_gem 'roo'
 add_gem "axlsx" # problems with newest version of RubyZip
-run 'bundle install'
+run 'bundle check && bundle install'
 say 'For more information check:', :green
 say 'https://github.com/randym/axlsx'
 say 'https://github.com/roo-rb/roo'

data/lib/r5/starter.rb

@@ -8,6 +8,17 @@ class Starter < Thor
 
   def initialize(*args)
     super
+    unless File.exists? "#{Dir.home}/.r5.yml"
+      say "Need to create config file - answer following question", :green
+      create_config_file
+    end
+
+    unless Config.check_settings.empty?
+      say Config.check_settings, :green
+      say 'Check structure of your config file - it seems you are missing required options mentioned above', :red
+      abort
+    end
+
     if ARGV[0] =~ /new/
       @dir = `pwd`.gsub("\n", '')
     elsif ARGV[0] =~ /add/
@@ -93,6 +104,27 @@ class Starter < Thor
 
   # local helpers
   no_commands do
+    require 'yaml'
+    def create_config_file
+      settings = Hash.new {|h,k| h[k] = Hash.new(&h.default_proc) }
+      settings['mysql']['user'] = ask("Insert name of mysql user:")
+      settings['mysql']['password'] = ask("Insert password for mysql user:")
+      settings['mysql']['host'] = ask("Host of mysql user:", default: 'localhost')
+      settings['admin']['login'] = ask("Login of default admin user:", default: 'admin')
+      settings['admin']['password'] = ask("Password of default password:", default: 'password')
+      settings['admin']['email'] = ask("E-mail of default user:", default: 'admin@example.com')
+      settings['admin']['lastname'] = ask("Lastname of default user:", default: 'administrator')
+      settings['notifier']['email'] = ask("Email for exception notification:", default: 'code@example.com')
+      settings['server']['name_prod'] = ask("Production server adddress:")
+      settings['server']['name_stage'] = ask("Stage server address:")
+      settings['server']['port'] = ask("SSH port for both:")
+      settings['server']['user'] = ask("Name of user on servers:")
+
+      File.open("#{Dir.home}/.r5.yml", 'w') do |file|
+        file.write(settings.to_yaml)
+      end
+    end
+
     def source_paths
       root_path = File.dirname __FILE__
       [root_path + '/template', root_path]

data/lib/r5/template/.ruby-version

@@ -1 +1 @@
-2.3.0
+version

data/lib/r5/template/lib/tasks/upload.rake

@@ -1,12 +1,21 @@
 namespace :server do
-  SERVER = "USER_NAME@SERVER_NAME"
+  STAGE = "STAGE_SERVER"
+  PRODUCTION = "PROD_SERVER"
   PORT = "PORT_NUMBER"
-  SSH = "-p#{PORT} #{SERVER}"
+
   SERVER_DIR = '/home/www/PROJECT_DIR'
 
-  desc "Uploads to #{SERVER} server"
+  desc 'Uploads to production server'
+  task :upload_production => :environment do
+    app_upload "-p#{PORT} USER_NAME@#{PRODUCTION}"
+  end
+
+  desc 'Uploads to stage server'
   task :upload => :environment do
+    app_upload "-p#{PORT} USER_NAME@#{STAGE}"
+  end
 
+  def app_upload server_ssh
     puts "Really upload to \033[0;37m#{SERVER_DIR}\033[0;32m ?"
     STDIN.gets
 
@@ -19,6 +28,6 @@ namespace :server do
     print 'Assets change? '
     puts change_assets = !!(`git diff --name-only HEAD^` =~ /assets/)
 
-    system %Q(ssh -t #{SSH} "source .zshrc && deploy.sh #{SERVER_DIR} #{change_assets}")
+    system %Q(ssh -t #{server_ssh} "source .zshrc && deploy.sh #{SERVER_DIR} #{change_assets}")
   end
 end

data/lib/r5/version.rb

@@ -1,3 +1,3 @@
 module R5
-  VERSION = "0.1.9"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: r5
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
 platform: ruby
 authors:
 - mousse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-05 00:00:00.000000000 Z
+date: 2016-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -134,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.7
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Rails generator using Thor gem for private usage mostly