crosstie 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: addaa0436fa54b3742779c06948c4952c78ab72e
-  data.tar.gz: 9acd54403092b0acf9ead18424674f6481dd887b
+  metadata.gz: 63d9caffe89a0d2e5bcf5aabd395c664e14a6afb
+  data.tar.gz: fecc0c37de9648a6c2ec08487056b00ac448d586
 SHA512:
-  metadata.gz: 8ecc927ffcbc7d12e5aed9636e6c147e5e23dd132a96087834b71b4ddb29e925fb3cbea3d0d1c51335c4b4f473733349409b8c32b2908cf5c0e5e69c6a437887
-  data.tar.gz: e18543b41fd576722618d8fd4a8902adb2ac2d71f15d3cace00959c50ed41e613a582a4c249ffccf03d94d1675886e1728ba69edcbce9ae117c240885e21cc59
+  metadata.gz: 0e98f7a87f055957b619e01d8294f1fca72c5d96c5bc90797ad4c4c4b767a8daa0c9c3fa057453f51002240be62c9893e00fc6ab86959e47cb632b9139ef875f
+  data.tar.gz: 3c624a3d4083b2d23ed41f5d67b8dbd36d91b463b174dee7613cac71d0f53a310358c1b1227b903e6dde872cfd6b2e6d62ec36d3ecadb3f3b8fe4953b18c2cd8

data/lib/crosstie/base.rb

@@ -23,19 +23,19 @@ perform :install_gems
 perform :bundle_install
 perform :add_gitignore
 # perform :stop_robots # stop google
+perform :skeleton
 perform :config_timezone
 perform :config_scaffold
 perform :serve_static
 perform :database_example
 perform :figaro
-perform :sidekiq
+perform :active_job
 perform :simple_form
 perform :rails_layout
 perform :rspec
 perform :guard
 perform :static_pages
 perform :devise
-perform :skeleton
 perform :user
 # perform :ldap # who needs this
 perform :controller_helpers

data/lib/crosstie/templates/{sidekiq.rb → active_job.rb}

@@ -1,19 +1,10 @@
-# sidekiq
+# active_job
 append_file "config/application.yml", <<-EOF
 REDIS_HOST: localhost
 REDIS_PORT: "6379"
 EOF
 run "cp config/application.yml config/application.yml.example"
-create_file "app/workers/hello_worker.rb", <<-EOF
-class HelloWorker
-  include Sidekiq::Worker
-  sidekiq_options queue: :default
 
-  def perform msg
-    puts msg
-  end
-end
-EOF
 create_file "config/initializers/sidekiq.rb", <<-EOF
 Sidekiq.configure_server do |config|
   config.redis = { :url => "redis://\#{ENV['REDIS_HOST']}:\#{ENV['REDIS_PORT']}/0", :namespace => '#{app_path}' }
@@ -23,6 +14,7 @@ Sidekiq.configure_client do |config|
   config.redis = { :url => "redis://\#{ENV['REDIS_HOST']}:\#{ENV['REDIS_PORT']}/0", :namespace => '#{app_path}' }
 end
 EOF
+
 create_file "tmp/pids/.keep", ""
 create_file "config/sidekiq.yml", <<-EOF
 ---
@@ -36,7 +28,8 @@ development:
 production:
   :concurrency: 2
 EOF
-inject_into_file "config/routes.rb", after: "Rails.application.routes.draw do\n" do
+
+inject_into_file "config/routes.rb", after: "# active_job\n" do
 <<-EOF
   require 'sidekiq/web'
   authenticate :user do
@@ -44,4 +37,11 @@ inject_into_file "config/routes.rb", after: "Rails.application.routes.draw do\n"
   end
 EOF
 end
-run "cp config/sidekiq.yml config/sidekiq.yml.example"
+
+inject_into_file "config/application.rb", after: "# active_job\n" do
+<<-EOF
+    config.active_job.queue_name_prefix = Rails.env
+    config.active_job.queue_name_delimiter = '.'
+    # config.active_job.queue_adapter = :sidekiq
+EOF
+end

data/lib/crosstie/templates/add_gitignore.rb

@@ -4,7 +4,6 @@ dump.rdb
 /config/database.yml
 /config/secrets.yml
 /config/ldap.yml
-/config/sidekiq.yml
 *.swp
 /coverage
 .DS_Store

data/lib/crosstie/templates/change_timezone.rb

@@ -1,3 +1,7 @@
 # application.rb
-# change timezone to beijing
-gsub_file "config/application.rb", "# config.time_zone = 'Central Time (US & Canada)'", "config.time_zone = 'Beijing'"
+# change timezone to Beijing
+inject_into_file 'config/application.rb', after: "# timezone\n" do
+<<-EOF
+  "config.time_zone = 'Beijing'"
+EOF
+end

data/lib/crosstie/templates/config_scaffold.rb

@@ -1,6 +1,6 @@
 # application.rb
 # stop scaffold from generating css, js, helper, test for helper, test for views
-inject_into_file "config/application.rb", after: "# config.i18n.default_locale = :de\n" do
+inject_into_file 'config/application.rb', after: "# scaffold\n" do
 <<-EOS
     config.generators do |g|
       g.stylesheets false

data/lib/crosstie/templates/skeleton.rb

@@ -1,12 +1,8 @@
-# user.rb
-inject_into_file "app/models/user.rb", before: 'end' do
+# application_controller.rb
+inject_into_file "app/controllers/application_controller.rb", before: 'end' do
 <<-EOF
 
-  # crosstie skeleton
-
-  # ldap
-
-  # username
+  # controller_helpers
 
   # authentication_token
 
@@ -15,15 +11,24 @@ inject_into_file "app/models/user.rb", before: 'end' do
 EOF
 end
 
-# application_controller.rb
-inject_into_file "app/controllers/application_controller.rb", before: 'end' do
+# application.rb
+inject_into_file "config/application.rb", after: "class Application < Rails::Application\n" do
 <<-EOF
 
-  # controller_helpers
+    # timezone
 
-  # authentication_token
+    # scaffold
 
-  # authorization
+    # active_job
+
+EOF
+end
+
+# routes.rb
+inject_into_file "config/routes.rb", after: "Rails.application.routes.draw do\n" do
+<<-EOF
+
+  # active_job
 
 EOF
 end

data/lib/crosstie/templates/user.rb

@@ -1,3 +1,20 @@
+# user.rb
+inject_into_file "app/models/user.rb", before: 'end' do
+<<-EOF
+
+  # crosstie skeleton
+
+  # ldap
+
+  # username
+
+  # authentication_token
+
+  # authorization
+
+EOF
+end
+
 # add username to users
 inject_into_file "app/models/user.rb", after: "# username\n" do
 <<-EOF

data/lib/crosstie/version.rb

@@ -1,3 +1,3 @@
 module Crosstie
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: crosstie
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Dong Qingshan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-12 00:00:00.000000000 Z
+date: 2014-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -70,6 +70,7 @@ files:
 - lib/crosstie.rb
 - lib/crosstie/base.rb
 - lib/crosstie/cli.rb
+- lib/crosstie/templates/active_job.rb
 - lib/crosstie/templates/add_gitignore.rb
 - lib/crosstie/templates/authentication_token.rb
 - lib/crosstie/templates/authorization.rb
@@ -99,7 +100,6 @@ files:
 - lib/crosstie/templates/run_test.rb
 - lib/crosstie/templates/seeds.rb
 - lib/crosstie/templates/serve_static.rb
-- lib/crosstie/templates/sidekiq.rb
 - lib/crosstie/templates/simple_form.rb
 - lib/crosstie/templates/skeleton.rb
 - lib/crosstie/templates/static_pages.rb