shopapp 0.2.51 → 0.2.52

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1bd1f451a6eaff8b850f65454b75815184706c4462bcd1203f28c0ca58355766
-  data.tar.gz: fa87ca928349ddb6c769ba33471c407f969ec43a5a9b3f33d12c83b2c70de82b
+  metadata.gz: fe827e49df4d4f6c7fa3ba32fda853cf5e54caca9e40a6d8b8797057e81a5fcf
+  data.tar.gz: b644d58814d8036da138f20ebf0b455032cd5d9e8e45d0ad7a4cd1864efbf597
 SHA512:
-  metadata.gz: 88da622ffc7c7bc839102152b14372a868dcdaf3c5a418f0b83b2d484c442107a5e5691467e6a243e5e61088a8127f0244cb9721280e8f95e6fc4aee08b417ad
-  data.tar.gz: 022dd24590771d223a981c0c7f9862ab2fd41dd4d581cafabff339ea4f6c28176f509ee429e15b135e9c9b8c53bbd7649eaf77ea5ab39259ab21bb79b8e6cacc
+  metadata.gz: 11e6a48cc197f74347d7f822f9d91ea29c9f2dde8764ba0cf672e5ed6818ed59b8ab9f47a2043756593c7f958ac9102da8199c7d39641affd450f49a4e06c890
+  data.tar.gz: c6275b093b9f6bed6e5e5aa89293e81a99cc4453462055d1884747148e1e78fe80dcea81a5d4e91643aefaf817704d9a048ab0fbf8270f5273bfb7d99f9538b3

data/README.md

@@ -39,7 +39,7 @@ each app on a different post, so that they can be developed in parallel on the
 same machine and keep sessions separate.
 
 Shoplift apps typically run on ports 3031 (Authlift) onwards. Get your own port
-and set it thorugh dev_port environment variable.
+and set it through dev_port environment variable.
 
     dev_port=3123 shopitapp demolift
 
@@ -66,4 +66,4 @@ Following creates default remote (zwr/demolift), but does not push:
 
 To build new version of this gem, change the version in shopapp.gemspec and run:
 
-    git push; gem build shopapp.gemspec ; gem push shopapp-0.2.51.gem; gem install shopapp
+    git push; gem build shopapp.gemspec ; gem push shopapp-0.2.52.gem; gem install shopapp

data/bin/shopitapp

@@ -5,6 +5,6 @@ elsif (RUBY_VERSION != '2.5.1') && (!ENV['ignore_ruby_version'])
   puts "ShopApp now insists on Ruby 2.5.1. Use 'ignore_ruby_version=1 shopitapp SHOPAPPNAME' to ignore."
 else
   puts "Creating shoplift app #{ARGV.first}"
-  cmd = "rails new #{ARGV.first} --skip-git --database=postgresql --skip-turbolinks --skip-test-unit --skip-bundle --skip-test-unit --template=#{File.expand_path '../../lib/shopapp/templates/shopapp_rails_new.rb', __FILE__}"
+  cmd = "rails new #{ARGV.first} --skip-git --database=postgresql --skip-bundle --skip-test-unit --template=#{File.expand_path '../../lib/shopapp/templates/shopapp_rails_new.rb', __FILE__}"
   exec cmd
 end

data/lib/shopapp/templates/shopapp_rails_new.rb

@@ -57,7 +57,7 @@ create_file "config/database.yml", <<~DATABASE
 route 'shoplift_single_sign_on'
 
 generate(:model, "company", "code:string", "name:string", "info:json")
-generate(:model, "company_state", "code:string", "state:string")
+generate(:model, "company_state", "company:belongs_to", "code:string", "state:string")
 generate('audited:install')
 
 insert_into_file "app/models/company.rb", "  audited\n", :after => "ApplicationRecord\n"
@@ -73,14 +73,17 @@ create_file "app/assets/stylesheets/application.scss", <<~SCSS
   /*
    *= require_self
    *
-   * Insert what you need after require_self, such as "require rails_bootstrap_forms".
+   * Insert what you need to this file, or add require_tree".
+   * Replace material with own compiled material from shopwindow project.
    */
+  @import "material";
   @import "shopapp";
   SCSS
 
 remove_file "app/assets/javascripts/application.js"
 create_file "app/assets/javascripts/application.js", <<~JS
-  //= require shopapp
+  //= require shopapp3
+  //= require turbolinks
   //= require_tree .
   JS
 
@@ -88,15 +91,19 @@ remove_file "app/views/layouts/application.html.erb"
 create_file "app/views/layouts/application.html.haml", <<~LAYOUT
   !!!
   %html
-    %head
-      %meta{:content => "text/html; charset=UTF-8", "http-equiv" => "Content-Type"}/
-      %title #{@app_name}
-      = csrf_meta_tags
-      = stylesheet_link_tag    'application', media: 'all'
-      = javascript_include_tag 'application'
-    %body
-      = render 'shopapp/shopapp' do
-        = yield
+  %head
+    %meta(content="text/html; charset=UTF-8" http-equiv="Content-Type")/
+    %meta(charset="utf-8")/
+    %meta(content="width=device-width, initial-scale=1, shrink-to-fit=no" name="viewport")/
+    %link(href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet")/
+    %link(href="https://fonts.googleapis.com/css?family=Fira+Sans:400,500,700" rel="stylesheet")/
+    %title #{@app_name}
+    = csrf_meta_tags
+    = stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track': 'reload'
+    = javascript_include_tag 'application', 'data-turbolinks-track': 'reload'
+  %body
+    = render 'shopapp/shopapp3' do
+      = yield
   LAYOUT
 
 create_file '.gitignore', <<~GITIGNORE
@@ -138,20 +145,84 @@ create_file 'config/settings.yml', <<~SETTINGS
   authlift_default_app_key:
   authlift_default_scope:
 
-  # Deployment settings:
-  production_server: #{@app_name}.shoplift.fi
-  production_user: shoplift
-  production_dbserver:
-  production_dbuser:
-
   # Override secret key base in local.yml if you do not want to use env. variables
   # secret_key_base: ## SecureRandom.hex 64
   SETTINGS
 
 create_file 'config/local.yml', <<~SETTINGS
   authlift_url: 'https://accounts.shoplift.fi/'
+
+  deployment:
+    stage:
+      folder: '#{@app_name}-stage/current'
+      server:
+      user: lifter
+      dbhost:
+      dbname: #{@app_name}_stage
+    production:
+      folder: '#{@app_name}-production/current'
+      server:
+      user: lifter
+      dbhost:
+      dbname: #{@app_name}_production
   SETTINGS
 
+create_file "Capfile", <<~FILECONTENT
+  require "capistrano/setup"
+  require "capistrano/deploy"
+
+  require "capistrano/scm/git"
+  install_plugin Capistrano::SCM::Git
+
+  require 'capistrano/rvm'
+  require "capistrano/bundler"
+  require "capistrano/rails/assets"
+  require "capistrano/rails/migrations"
+  require "capistrano/passenger"
+  # require "capistrano/yarn"
+
+  Dir.glob("lib/capistrano/tasks/*.rake").each { |r| import r }
+FILECONTENT
+
+github_organization = ENV['github_organization'] || 'zwr'
+github_project_name = ENV['github_project_name'] || @app_name
+
+create_file "config/deploy.rb", <<~FILECONTENT
+  lock "~> 3.11.0"
+
+  set :application, "#{@app_name.capitalize}"
+  set :repo_url, "git@github.com:#{github_organization}/#{github_project_name}.git"
+  set :rvm_ruby_version, '2.5.1'
+  append :linked_files, 'config/local.yml'
+  append :linked_files, 'config/local.yml'
+  append :linked_files, 'config/database.yml'
+
+  set :deploy_to, "/home/shoplift/#{@app_name}"
+  set :passenger_restart_with_touch, true
+FILECONTENT
+
+create_file "config/deploy/stage.rb", <<~FILECONTENT
+  set :stage, :stage
+  set :rails_env, :production
+  set :branch, "stage"
+  set :rvm_type, :user
+  set :rvm_custom_path, '/usr/share/rvm'
+
+  set :deploy_to, "/home/lifter/#{@app_name}-stage"
+  server "#{@app_name}.zwr.fi", user: "lifter", roles: %w{app db web}
+FILECONTENT
+
+create_file "config/deploy/production.rb", <<~FILECONTENT
+  set :stage, :production
+  set :rails_env, :production
+  set :branch, "production"
+  set :rvm_type, :user
+  set :rvm_custom_path, '/usr/share/rvm'
+
+  set :deploy_to, "/home/lifter/#{@app_name}-production"
+  server "#{@app_name}.shoplift.fi", user: "lifter", roles: %w{app db web}
+FILECONTENT
+
 create_file 'lib/templates/rails/scaffold_controller/controller.rb.tt', <<~TEMPLATE
   <% if namespaced? -%>
   require_dependency "<%= namespaced_path %>/application_controller"
@@ -228,8 +299,6 @@ git add: '.'
 git commit: "-a -m 'shopapp created'"
 
 unless ENV['skip_github_remote']
-  github_organization = ENV['github_organization'] || 'zwr'
-  github_project_name = ENV['github_project_name'] || @app_name
   git remote: "add origin git@github.com:#{github_organization}/#{github_project_name}.git"
   git push: '-u origin master' unless ENV['skip_github_push']
 end
@@ -248,4 +317,4 @@ puts
 puts "    $ cd #{@app_name}"
 puts "    $ rails g scaffold dog name:string"
 puts "    $ rake db:migrate"
-puts "    $ open http://localhost:3999/dogs ; rails s"
+puts "    $ open http://localhost:#{@app_dev_port}/dogs ; rails s"

data/shopapp.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'shopapp'
-  s.version     = '0.2.51'
+  s.version     = '0.2.52'
   s.date        = '2019-05-03'
   s.summary     = 'Do a shoplift.'
   s.description = 'Ha! Art thou Bedlam? Dost thou thirst base Trojan, to have me fold up Parca\'s fatal web? Hence!\

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shopapp
 version: !ruby/object:Gem::Version
-  version: 0.2.51
+  version: 0.2.52
 platform: ruby
 authors:
 - Zeljko