crosstie 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4142050fb8366159be4568afe80a4d27f6dd0ac
-  data.tar.gz: e980f57bdb85326d0519e268669b49f4f43a265c
+  metadata.gz: ee1aab6bb3ef46c676246f26c92e5fe8e89492c9
+  data.tar.gz: 0a5a7e4aaa0f060b372967672b7aaf7ca148f621
 SHA512:
-  metadata.gz: d7a66bd82912c50d5ee5d8d64dc88cfccb1940e74a96e04eeb2a58a0f82f6cbcccbfb3d5ae6ced652da280640e72635b391556dbc620ccbdfac3598519e11966
-  data.tar.gz: 92c527784e26ae581403b8ce4ffc9d4bfd5a823ab008f4f4cad49f35c7bc7ab4dfadb0b110d2ae776ecd45172d68937536de45930d0227f81c26db0240ab23c3
+  metadata.gz: 743c95838863f2ec1161e493862ea5a18bd3a0353ad23d0ec86b2122ebdb8d488eb7d9362ab8a8bdb8eb64add50785765ea28527dcbe1d643d9a006e14f2b722
+  data.tar.gz: 43d105ecb8afb80bd2120982e63b7d168ee551d34f01929702b4c99ce8d27c81c32f40fa192f8f31cb26a4bfd8bfb08a707d87a2edb647e0ec98e9000bf0d065

data/CHANGELOG.md

@@ -0,0 +1,24 @@
+### Unreleased
+
+### 0.0.7
+    * run.sh for development and test
+    * local install flag
+    * remove spring from Guardfile
+    * update gem figaro to 1.1.1
+    * add bullet
+    * grant all roles to the first user
+    * add spec/routing/static_pages_spec.rb
+    * add app/helpers/application_helper.rb
+    * comment config/initializers/sidekiq.rb
+    * uncomment secret_key in config/initializers/devise.rb
+    * app/view/layouts/_navigation_links.html.slim
+    * rails new --skip-spring --skip-bundle --skip-test-unit
+    * seed at last
+    * improve controller tests
+    * adjust task order
+    * add normal role for signed up users
+    * fix bug: non normal user cannot sign out
+    * sign in form input order
+    * sign up form auto focus on username
+    * colorful user role activation
+    * web console

data/lib/crosstie/base.rb

@@ -15,6 +15,21 @@ end
 
 def perform task
   eval File.read File.join root, "templates", "#{task}.rb"
+rescue => e
+  puts "error on performing #{task}"
+  raise e
+end
+
+def config
+  return @config if @config
+  config_path = '/tmp/crosstie/config.yml'
+  if File.exist? config_path
+    @config = YAML.load(File.read(config_path))
+    File.delete config_path
+  else
+    @config = {}
+  end
+  @config
 end
 
 perform :git_init
@@ -34,6 +49,7 @@ perform :simple_form
 perform :rspec
 perform :guard
 perform :static_pages
+perform :web_console
 perform :devise
 perform :rails_layout # authform for device
 perform :user
@@ -42,7 +58,9 @@ perform :controller_helpers
 perform :authentication_token
 perform :rolify
 perform :authorization
-perform :seeds
+perform :helper
 perform :resources
+perform :seeds
 git_commit "project created"
 perform :run_test
+perform :run_seeds

data/lib/crosstie/cli.rb

@@ -8,25 +8,29 @@ module Crosstie
 
     desc 'new my_app', 'create a new rails application'
     def new name
-      if File.exist? 'resources.yml'
+      if File.exist? 'config.yml'
         FileUtils.mkdir_p '/tmp/crosstie'
-        FileUtils.cp 'resources.yml', '/tmp/crosstie/resources.yml'
+        FileUtils.cp 'config.yml', '/tmp/crosstie/config.yml'
       end
-      cmd = "rails new #{name} --template #{template_path}"
+      cmd = "rails new #{name} --template #{template_path} --skip-spring --skip-test-unit --skip-bundle"
       puts cmd
       system cmd
     end
 
-    desc 'resources', 'create a resources.yml template'
-    def resources
-      puts 'writing resources.yml'
-      File.write 'resources.yml', <<-EOF
-article:
-  - title:string
-  - content:text
-comment:
-  - article:references
-  - content:text
+    desc 'config', 'create a config.yml template'
+    option :local, type: :boolean
+    def config
+      puts 'writing config.yml'
+      File.write 'config.yml', <<-EOF
+options:
+  local: #{!!options[:local]}
+resources:
+  article:
+    - title:string
+    - content:text
+  comment:
+    - article:references
+    - content:text
       EOF
     end
 

data/lib/crosstie/templates/active_job.rb

@@ -6,13 +6,13 @@ EOF
 run "cp config/application.yml config/application.yml.example"
 
 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}' }
-end
-
-Sidekiq.configure_client do |config|
-  config.redis = { :url => "redis://\#{ENV['REDIS_HOST']}:\#{ENV['REDIS_PORT']}/0", :namespace => '#{app_path}' }
-end
+#Sidekiq.configure_server do |config|
+#  config.redis = { :url => "redis://\#{ENV['REDIS_HOST']}:\#{ENV['REDIS_PORT']}/0", :namespace => '#{app_path}' }
+#end
+#
+#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", ""

data/lib/crosstie/templates/authorization/application_controller.rb

@@ -1,5 +1,5 @@
 
-  before_action :authenticate_normal!
+  before_action :authenticate_normal!, unless: :devise_controller?
 
   class AuthenticationError < SecurityError; end
   class AuthorizationError < SecurityError; end

data/lib/crosstie/templates/authorization/index.html.slim

@@ -14,4 +14,4 @@ table.table
                 %w(revoke active btn-success) : %w(grant inactive btn-danger)
               = hidden_field_tag :operation, operation
               = hidden_field_tag :role, role
-              = f.submit activation, class: "btn \#{btn_class}"
+              = f.submit activation, class: "btn #{btn_class}"

data/lib/crosstie/templates/bullet.rb

@@ -0,0 +1,9 @@
+# bullet # gem bug has been fixed
+
+#inject_into_file "config/environments/development.rb", before: "\nend" do
+#  config.after_initialize do
+#    Bullet.enable = true
+#    Bullet.bullet_logger = true
+#    Bullet.add_footer = true
+#  end
+#end

data/lib/crosstie/templates/bundle_install.rb

@@ -1,2 +1,5 @@
-run "bundle install -V"
-# run "bundle install --local" # for development
+if config['options']['local']
+  run "bundle install --local"
+else
+  run "bundle install --verbose"
+end

data/lib/crosstie/templates/devise.rb

@@ -1,6 +1,9 @@
 # devise
 generate "devise:install"
 
+# secret key
+gsub_file "config/initializers/devise.rb", "# config.secret_key", "config.secret_key"
+
 # improve password strength
 gsub_file "config/initializers/devise.rb", "config.password_length = 8..128", "config.password_length = 4..128"
 

data/lib/crosstie/templates/guard.rb

@@ -1,3 +1,2 @@
 # guard
 run "bundle exec guard init rspec"
-inject_into_file "Guardfile", ", cmd: 'spring rspec'", after: ":rspec"

data/lib/crosstie/templates/helper.rb

@@ -0,0 +1,15 @@
+# helper
+inject_into_file "app/helpers/application_helper.rb", after: "module ApplicationHelper\n" do
+<<-EOF
+
+  def link_for obj, name = :name, i: false, b: false
+    return nil unless obj
+    raise "not respond to \#{name}" unless obj.respond_to? name
+
+    html = link_to obj.send(name), obj
+    html = content_tag :i, html if i
+    html = content_tag :b, html if b
+    html
+  end
+EOF
+end

data/lib/crosstie/templates/install_gems.rb

@@ -1,6 +1,6 @@
 gem 'slim-rails', '3.0.1'
 gem 'therubyracer', '0.12.2'
-gem 'figaro', '1.1.0'
+gem 'figaro', '1.1.1'
 gem 'bootstrap-sass', '3.3.4.1'
 gem 'simple_form', '3.1.0'
 gem 'quiet_assets', '1.1.0'
@@ -22,6 +22,7 @@ gem_group :development do
   gem 'rack-mini-profiler', '0.9.3'
   gem 'rails_layout', '1.0.25'
   gem 'annotate', '2.6.8'
+  gem 'bullet', '4.14.7'
 end
 
 gem_group :development, :test do

data/lib/crosstie/templates/rails_layout.rb

@@ -1,2 +1,12 @@
 generate 'layout:install', 'bootstrap3', '--force'
 generate 'layout:devise', 'bootstrap3'
+
+remove_file "app/views/layouts/_navigation_links.html.erb"
+create_file "app/views/layouts/_navigation_links.html.slim", <<-EOF
+- if user_signed_in?
+  li = link_to 'Users', users_path
+  li = link_to "Sign out", destroy_user_session_path, method: :delete
+- else
+  li = link_to "Sign in", new_user_session_path
+  li = link_to "Sign up", new_user_registration_path
+EOF

data/lib/crosstie/templates/resources.rb

@@ -1,22 +1,34 @@
 # scaffold resources
-resources_path = '/tmp/crosstie/resources.yml'
-if File.exist? resources_path
-  YAML.load(File.read(resources_path)).each do |resource, fields|
+
+if config['resources']
+
+  config['resources'].each do |resource, fields|
+
     generate "scaffold", resource, *fields
+
     rake "db:migrate"
-    inject_into_file "spec/controllers/#{resource.tableize}_controller_spec.rb", after: "RSpec.describe #{resource.pluralize.camelize}Controller, type: :controller do\n" do
+
+    inject_into_file "spec/controllers/#{resource.tableize}_controller_spec.rb", after: "RSpec.describe #{resource.tableize.camelize}Controller, type: :controller do\n" do
 <<-EOF
 
-  before { sign_in_user }
+  before do
+    sign_in_user
+    @#{resource} = FactoryGirl.build(:#{resource})
+  end
 EOF
     end
 
     gsub_file "spec/controllers/#{resource.tableize}_controller_spec.rb",
         'skip("Add a hash of attributes valid for your model")',
-        "FactoryGirl.build(:#{resource}).attributes"
-  end
+        "@#{resource}.attributes"
+
+    inject_into_file "app/views/layouts/_navigation_links.html.slim", after: "- if user_signed_in?\n" do
+<<-EOF
+  li = link_to '#{resource.tableize.titleize}', #{resource.tableize}_path
+EOF
+    end
 
-  File.delete resources_path
+  end
 
   run "bundle exec annotate"
 end

data/lib/crosstie/templates/run_seeds.rb

@@ -0,0 +1 @@
+rake "db:seed"

data/lib/crosstie/templates/seeds.rb

@@ -1,8 +1,4 @@
 append_file "db/seeds.rb", <<-EOF
 user = User.create! username: "admin", email: "admin@example.com", password: "password"
-Role::USER_ROLES.each do |role|
-  user.grant role
-end
 puts "sign in with:\n\tusername: admin\n\tpassword: password"
 EOF
-rake "db:seed"

data/lib/crosstie/templates/skeleton.rb

@@ -21,6 +21,8 @@ inject_into_file "config/application.rb", after: "class Application < Rails::App
 
     # active_job
 
+    # web_console
+
 EOF
 end
 
@@ -30,5 +32,7 @@ inject_into_file "config/routes.rb", after: "Rails.application.routes.draw do\n"
 
   # active_job
 
+  # web_console
+
 EOF
 end

data/lib/crosstie/templates/static_pages.rb

@@ -1,11 +1,14 @@
 # static pages
-generate "controller", "static_pages", "home", "status"
+generate "controller", "static_pages", "home", "status", "console"
+
 inject_into_file "app/controllers/static_pages_controller.rb", after: "class StaticPagesController < ApplicationController\n" do
 <<-EOF
   skip_before_action :authenticate_user!, only: [:home, :status]
   skip_before_action :authenticate_normal!, only: [:home, :status]
+  before_action :authenticate_system!, only: [:console]
 EOF
 end
+
 inject_into_file "app/controllers/static_pages_controller.rb", after: "def status\n" do
 <<-EOF
     render json: {
@@ -16,11 +19,39 @@ inject_into_file "app/controllers/static_pages_controller.rb", after: "def statu
     }
 EOF
 end
+
 gsub_file "config/routes.rb", "get 'static_pages/home'", "root to: 'static_pages#home'"
 gsub_file "config/routes.rb", "get 'static_pages/status'", "get '/status' => 'static_pages#status'"
+gsub_file "config/routes.rb", "get 'static_pages/console'", "get '/console' => 'static_pages#console'"
+
 inject_into_file "spec/controllers/static_pages_controller_spec.rb", after: "RSpec.describe StaticPagesController, type: :controller do\n" do
 <<-EOF
 
   before { sign_in_user }
 EOF
 end
+
+create_file "spec/routing/static_pages_spec.rb", <<-EOF
+require "rails_helper"
+
+describe StaticPagesController, :type => :routing do
+  describe "routing" do
+
+    it "routes to #home" do
+      expect(:get => "/").to route_to("static_pages#home")
+    end
+
+    it "routes to #status" do
+      expect(:get => "/status").to route_to("static_pages#status")
+    end
+
+    it "routes to #console" do
+      expect(:get => "/console").to route_to("static_pages#console")
+    end
+  end
+end
+EOF
+
+append_file "app/views/static_pages/console.html.slim", <<-EOF
+= console
+EOF

data/lib/crosstie/templates/user.rb

@@ -6,6 +6,10 @@ inject_into_file "app/models/user.rb", before: 'end' do
 
   # ldap
 
+  # grant roles
+
+  # grant normal
+
   # username
 
   # authentication_token
@@ -15,6 +19,40 @@ inject_into_file "app/models/user.rb", before: 'end' do
 EOF
 end
 
+# grant roles for the first user
+inject_into_file "app/models/user.rb", after: "# grant roles\n" do
+<<-EOF
+  after_create :grant_roles, if: Proc.new {
+    !Rails.env.test? && User.count == 1
+  }
+
+  def grant_roles
+    Role::USER_ROLES.each do |role|
+      self.grant role
+    end
+  end
+EOF
+end
+
+# grant normal role for signed up users
+inject_into_file "app/models/user.rb", after: "# grant normal\n" do
+<<-EOF
+  after_create :grant_normal, if: Proc.new {
+    ENV['GRANT_NORMAL']
+  }
+
+  def grant_normal
+    self.grant :normal
+  end
+EOF
+end
+
+append_file "config/application.yml", <<-EOF
+#GRANT_NORMAL: true
+EOF
+run "cp config/application.yml config/application.yml.example"
+
+
 # add username to users
 inject_into_file "app/models/user.rb", after: "# username\n" do
 <<-EOF
@@ -32,14 +70,21 @@ gsub_file "app/views/devise/sessions/new.html.erb", "email_field", "text_field"
   "app/views/devise/registrations/new.html.erb",
   "app/views/devise/registrations/edit.html.erb",
 ].each do |file|
+  gsub_file file, ", :autofocus => true", ""
   inject_into_file file, after: "<%= devise_error_messages! %>\n" do
 <<-EOF
     <div class="form-group">
       <%= f.label :username %>
-      <%= f.text_field :username, class: 'form-control' %>
+      <%= f.text_field :username, autofocus: true, class: 'form-control' %>
     </div>
 EOF
   end
 end
 
 gsub_file "config/initializers/devise.rb", "# config.authentication_keys = [ :email ]", "config.authentication_keys = [ :username ]"
+
+# add tabindex to sign in
+inject_into_file "app/views/devise/sessions/new.html.erb", ", tabindex: 1", after: "f.text_field :username"
+inject_into_file "app/views/devise/sessions/new.html.erb", ", tabindex: 2", after: "f.password_field :password"
+inject_into_file "app/views/devise/sessions/new.html.erb", ", tabindex: 3", after: "f.check_box :remember_me"
+inject_into_file "app/views/devise/sessions/new.html.erb", ", tabindex: 4", after: "f.submit 'Sign in'"

data/lib/crosstie/templates/web_console.rb

@@ -0,0 +1,5 @@
+inject_into_file "config/application.rb", after: "# web_console\n" do
+<<-EOF
+    config.web_console.whitelisted_ips = '0.0.0.0/0'
+EOF
+end

data/lib/crosstie/version.rb

@@ -1,3 +1,3 @@
 module Crosstie
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/run.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+version=`ruby -Ilib -e 'require "crosstie/version"; puts Crosstie::VERSION'`
+spec=crosstie.gemspec
+gem=crosstie-$version.gem
+
+rm -r $gem
+gem build $spec
+gem install $gem --local
+mkdir -p tmp
+cd tmp
+pwd
+ps aux | grep spring | awk '{print $2}' | xargs kill -9
+rm -rf sandbox
+crosstie config --local
+crosstie new sandbox

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: crosstie
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Dong Qingshan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-30 00:00:00.000000000 Z
+date: 2015-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -61,6 +61,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -80,6 +81,7 @@ files:
 - lib/crosstie/templates/authorization/users.rb
 - lib/crosstie/templates/authorization/users_controller.rb
 - lib/crosstie/templates/authorization/users_controller_spec.rb
+- lib/crosstie/templates/bullet.rb
 - lib/crosstie/templates/bundle_install.rb
 - lib/crosstie/templates/change_source.rb
 - lib/crosstie/templates/change_timezone.rb
@@ -91,12 +93,14 @@ files:
 - lib/crosstie/templates/figaro.rb
 - lib/crosstie/templates/git_init.rb
 - lib/crosstie/templates/guard.rb
+- lib/crosstie/templates/helper.rb
 - lib/crosstie/templates/install_gems.rb
 - lib/crosstie/templates/ldap.rb
 - lib/crosstie/templates/rails_layout.rb
 - lib/crosstie/templates/resources.rb
 - lib/crosstie/templates/rolify.rb
 - lib/crosstie/templates/rspec.rb
+- lib/crosstie/templates/run_seeds.rb
 - lib/crosstie/templates/run_test.rb
 - lib/crosstie/templates/seeds.rb
 - lib/crosstie/templates/serve_static.rb
@@ -105,7 +109,9 @@ files:
 - lib/crosstie/templates/static_pages.rb
 - lib/crosstie/templates/stop_robots.rb
 - lib/crosstie/templates/user.rb
+- lib/crosstie/templates/web_console.rb
 - lib/crosstie/version.rb
+- run.sh
 homepage: https://github.com/dongqs/crosstie
 licenses:
 - MIT