xing-framework 0.2.3 → 0.2.4

data/default_configuration/base_app/.ruby-version

@@ -0,0 +1 @@
+2.2.2

data/default_configuration/base_app/Gemfile.lock

@@ -79,14 +79,14 @@ GEM
       tilt (> 0)
       valise (~> 1.1)
     mime-types (2.6.1)
-    mini_portile (0.6.2)
+    mini_portile2 (2.0.0)
     minitest (5.7.0)
     multi_json (1.11.0)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
     net-ssh (2.9.2)
-    nokogiri (1.6.6.2)
-      mini_portile (~> 0.6.0)
+    nokogiri (1.6.7.1)
+      mini_portile2 (~> 2.0.0.rc2)
     rack (1.6.4)
     rack-test (0.6.3)
       rack (>= 1.0)
@@ -135,7 +135,7 @@ GEM
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
     valise (1.2.0)
-    xing-root (0.0.7)
+    xing-root (0.0.9)
       caliph (~> 0.3)
       edict (< 1.0)
       mattock (~> 0.10)

data/default_configuration/base_app/Rakefile

@@ -8,8 +8,10 @@ Xing::Tasks::Build.new
 Xing::Tasks::Develop.new
 Xing::Tasks::Frontend.new
 Xing::Tasks::Spec.new
+Xing::Tasks::Initialize.new
 
-
+desc "setup database"
+task :initialize => ['initialize:all']
 desc "The whole shebang"
 task :build => [:check_dependencies, 'build:all']
 

data/default_configuration/base_app/backend/.pivotal-brancher/config.yaml

@@ -0,0 +1,2 @@
+---
+project: 145667

data/default_configuration/base_app/backend/.ruby-gemset.example

@@ -0,0 +1 @@
+cms2

data/default_configuration/base_app/backend/.ruby-version

@@ -0,0 +1 @@
+2.2.2

data/default_configuration/base_app/backend/.ruby-version.06.05.2015-10:38:25

@@ -0,0 +1 @@
+2.2.2p95

data/default_configuration/base_app/backend/.ruby-version.example

@@ -0,0 +1 @@
+2.1.2

data/default_configuration/base_app/config/deploy.rb

@@ -1,7 +1,7 @@
 # config valid only for Capistrano 3.1
 lock '3.4'
 
-set :repo_url, 'git@git.lrdesign.com:lrd/cms2.git'
+set :repo_url, 'git@github.com:example/example.git'
 set :pty, true
 
 # Default value for :format is :pretty
@@ -43,6 +43,7 @@ set :required_writeable_files, %w{
 # set :keep_releases, 5
 
 set :backend_path, proc{ File::join(release_path, "backend") }
+set :frontend_path, proc{ File::join(release_path, "frontend") }
 set :backend_shared, proc{ File::join(shared_path, "backend") }
 set :webserver_group, "apache"
 set :webserver_user, "apache"
@@ -58,7 +59,7 @@ namespace :deploy do
     on roles(:app), :in => :parallel do
       within release_path do
         with :rails_env => fetch(:stage) do
-          rake "build"
+          execute "bundle", "exec", "rake", "build"
         end
       end
     end
@@ -67,17 +68,33 @@ namespace :deploy do
 
   task :bundle_config do
     on roles(:app), :in => :parallel do
-      execute "mkdir -p #{fetch(:backend_path)}/.bundle"
-      bundle_config = StringIO.new(<<-EOC)
+      [fetch(:backend_path), fetch(:frontend_path), fetch(:release_path)].each do |path|
+
+        execute "mkdir -p #{path}/.bundle"
+        bundle_config = StringIO.new(<<-EOC)
 ---
 BUNDLE_FROZEN: '1'
 BUNDLE_PATH: "#{File::join(shared_path, "backend/vendor/bundle")}"
 BUNDLE_DISABLE_SHARED_GEMS: '1'
-      EOC
-      upload! bundle_config, "#{fetch(:backend_path)}/.bundle/config"
+        EOC
+        upload! bundle_config, "#{path}/.bundle/config"
+      end
     end
   end
-  before :build, :bundle_config
+
+  task :bundle_root do
+    on roles(:app), :in => :parallel do
+      within release_path do
+        as(:root) do
+          execute "bundle", "install"
+        end
+      end
+    end
+  end
+
+  before :bundle_root, :bundle_config
+
+  before :build, :bundle_root
 
   task :perms do
     on roles(:app), :in => :parallel do

data/default_configuration/base_app/frontend/.jshintrc

@@ -0,0 +1,15 @@
+{
+  "debug": false,
+  "bitwise": true,
+  "forin": true,
+  "curly": true,
+  "immed": true,
+  "latedef": false,
+  "newcap": true,
+  "noarg": true,
+  "sub": true,
+  "eqnull": true,
+  "esnext": true,
+  "browser": true,
+  "-W100": true
+}

data/default_configuration/base_app/frontend/.pivotal-brancher/config.yaml

@@ -0,0 +1 @@
+project: 1154118

data/default_configuration/base_app/frontend/.ruby-version

@@ -0,0 +1 @@
+2.2.2

data/default_configuration/base_app/frontend/.travis.yml

@@ -0,0 +1,12 @@
+language: node_js
+node_js:
+  - "0.10"
+
+before_script:
+  - export DISPLAY=:99.0
+  - sh -e /etc/init.d/xvfb start
+  - npm install --quiet -g grunt-cli karma bower
+  - bower install
+
+script: grunt
+

data/default_configuration/templates/backend/config/database.yml

@@ -0,0 +1,22 @@
+development: &development
+  adapter: postgresql
+  encoding: unicode
+  database: {{app_name}}_dev
+  # username: postgres
+  pool: 5
+  host: 127.0.0.1
+
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
+# Do not set this db to the same as development or production.
+test:
+  <<: *development
+  database: {{app_name}}_test
+
+production:
+  adapter: postgresql
+  encoding: unicode
+  database: {{app_name}}_dev
+  # username: postgres
+  pool: 5
+  host: 127.0.0.1

data/default_configuration/templates/backend/config/database.yml.ci

@@ -0,0 +1,9 @@
+test: &test
+  adapter: postgresql
+  encoding: unicode
+  database: {{app_name}}_test
+  pool: 5
+  host: 127.0.0.1
+
+development:
+  <<: *test

data/default_configuration/templates/backend/config/database.yml.example

@@ -0,0 +1,22 @@
+development: &development
+  adapter: postgresql
+  encoding: unicode
+  database: {{app_name}}_dev
+  # username: postgres
+  pool: 5
+  host: 127.0.0.1
+
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
+# Do not set this db to the same as development or production.
+test:
+  <<: *development
+  database: {{app_name}}_test
+
+production:
+  adapter: postgresql
+  encoding: unicode
+  database: {{app_name}}_dev
+  # username: postgres
+  pool: 5
+  host: 127.0.0.1

data/default_configuration/templates/backend/config/secrets.yml

@@ -0,0 +1,57 @@
+# Be sure to restart your server when you modify this file.
+
+# Your secret key is used for verifying the integrity of signed cookies.
+# If you change this key, all old signed cookies will become invalid!
+
+# Make sure the secret is at least 30 characters and all random,
+# no regular words or you'll be exposed to dictionary attacks.
+# You can use `rake secret` to generate a secure secret key.
+
+# Make sure the secrets in this file are kept private
+# if you're sharing your code publicly.
+
+development:
+  secret_key_base: {{dev_secret_key_base}}
+  smtp:
+    address: smtp.CHANGEME.com
+    port: 587
+    domain: {{app_name}}.com
+    user_name: admin@{{app_name}}.com
+    password: xxxxxxxx
+  email:
+    from: admin@{{app_name}}.com
+    reply_to: admin@{{app_name}}.com
+    # Destination for emails in dev environment
+    # this should be left blank in production
+    test: test@{{app_name}}.com
+    from_domain: 'localhost:3000'
+  snapshot_server:
+    url: https://www.notaserver.com
+    user: user
+    password: password
+  sitemap_base_url: http://localhost:3000/
+  asset_host: http://localhost:3000/
+
+test:
+  secret_key_base: {{test_secret_key_base}}
+  smtp:
+    address: smtp.{{app_name}}.com
+    port: 587
+    domain: {{app_name}}.com
+    user_name: admin@{{app_name}}.com
+    password: xxxxxxxx
+  email:
+    from: admin@{{app_name}}.com
+    reply_to: admin@{{app_name}}.com
+    from_domain: 'example.com'
+  snapshot_server:
+    url: https://www.notaserver.com
+    user: user
+    password: password
+  sitemap_base_url: http://localhost:3000/
+  asset_host: http://localhost:3000/
+
+# Do not keep production secrets in the repository,
+# instead read values from the environment.
+production:
+  secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>

data/default_configuration/templates/backend/config/secrets.yml.ci

@@ -0,0 +1,21 @@
+test:
+  secret_key_base: {{test_secret_key_base}}
+  smtp:
+    address: smtp.CHANGEME.com
+    port: 587
+    domain: {{app_name}}.com
+    user_name: admin@{{app_name}}.com
+    password: xxxxxxxx
+  email:
+    from: admin@{{app_name}}.com
+    reply_to: admin@{{app_name}}.com
+    from_domain: 'example.com'
+  snapshot_server:
+    url: https://www.notaserver.com
+    user: user
+    password: password
+  sitemap_base_url: http://localhost:3000/
+  asset_host: http://localhost:3000/
+
+development:
+  <<: *test

data/default_configuration/templates/backend/config/secrets.yml.example

@@ -0,0 +1,57 @@
+# Be sure to restart your server when you modify this file.
+
+# Your secret key is used for verifying the integrity of signed cookies.
+# If you change this key, all old signed cookies will become invalid!
+
+# Make sure the secret is at least 30 characters and all random,
+# no regular words or you'll be exposed to dictionary attacks.
+# You can use `rake secret` to generate a secure secret key.
+
+# Make sure the secrets in this file are kept private
+# if you're sharing your code publicly.
+
+development:
+  secret_key_base: {{dev_secret_key_base}}
+  smtp:
+    address: smtp.CHANGEME.com
+    port: 587
+    domain: {{app_name}}.com
+    user_name: admin@{{app_name}}.com
+    password: xxxxxxxx
+  email:
+    from: admin@{{app_name}}.com
+    reply_to: admin@{{app_name}}.com
+    # Destination for emails in dev environment
+    # this should be left blank in production
+    test: test@{{app_name}}.com
+    from_domain: 'localhost:3000'
+  snapshot_server:
+    url: https://www.notaserver.com
+    user: user
+    password: password
+  sitemap_base_url: http://localhost:3000/
+  asset_host: http://localhost:3000/
+
+test:
+  secret_key_base: {{test_secret_key_base}}
+  smtp:
+    address: smtp.{{app_name}}.com
+    port: 587
+    domain: {{app_name}}.com
+    user_name: admin@{{app_name}}.com
+    password: xxxxxxxx
+  email:
+    from: admin@{{app_name}}.com
+    reply_to: admin@{{app_name}}.com
+    from_domain: 'example.com'
+  snapshot_server:
+    url: https://www.notaserver.com
+    user: user
+    password: password
+  sitemap_base_url: http://localhost:3000/
+  asset_host: http://localhost:3000/
+
+# Do not keep production secrets in the repository,
+# instead read values from the environment.
+production:
+  secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>

data/default_configuration/templates/backend/gitattributes

@@ -0,0 +1 @@
+Gemfile.lock -merge

data/default_configuration/templates/backend/gitignore

@@ -0,0 +1,46 @@
+log/*
+screenlog.*
+tmp/
+.dotest/
+config/initializers/secret_token.rb
+db/schema.sql
+db/schema.rb
+db/*.sqlite3*
+db_backups/*
+database.yml
+public/stylesheets/*.css
+!public/stylesheets/reset.css
+public/javascripts/all.js
+public/assets/source_maps/*
+public/system
+uuid.state
+nbproject*
+index/*
+identifier
+secret
+last_run
+.project
+.#*
+\#*
+*~
+vendor/**/**/doc/*
+vendor/plugins/footnotes/*
+rsa_key*
+*.pem
+*.key
+system/datas/*
+sqldumps/*
+capybara*.html
+.rspec
+.simplecov
+public/sitemap.xml
+*.sublime-project
+*.sublime-workspace
+coverage/
+errors.err
+.cadre/
+spec/support/cadre.rb
+secrets.yml
+public/frontend_snapshots
+spec/fixtures/sitemap_scratch
+dump.rdb

data/default_configuration/templates/frontend/.gitattributes

@@ -0,0 +1 @@
+vendor/**/* diff=rawtext

data/default_configuration/templates/frontend/.gitignore

@@ -0,0 +1,12 @@
+.bundle/
+*.sw*
+*~
+build/
+bin/
+node_modules/
+.vimrc
+vendor/
+src/common/environment.js
+.ruby-gemset
+**/*.map
+.sass-cache/

data/default_configuration/templates/frontend/gitattributes

@@ -0,0 +1 @@
+vendor/**/* diff=rawtext

data/default_configuration/templates/frontend/gitignore

@@ -0,0 +1,12 @@
+.bundle/
+*.sw*
+*~
+build/
+bin/
+node_modules/
+.vimrc
+vendor/
+src/common/environment.js
+.ruby-gemset
+**/*.map
+.sass-cache/

data/default_configuration/templates/gitignore

@@ -0,0 +1,12 @@
+*.sw?
+!*.swf
+*.orig
+.DS_Store
+.ruby-gemset
+tmp/
+.vim-role
+.sass-cache/
+.bundle/
+.envrc
+**/last_run
+**/*.log

data/lib/xing/cli/generators/new_project.rb

@@ -1,12 +1,15 @@
 require 'caliph'
 require 'bundler'
+require 'architecture/dsl'
 
 module Xing::CLI::Generators
   class NewProject
     include Caliph::CommandLineDSL
+    include Architecture
 
     attr_accessor :target_name
     attr_accessor :ruby_version
+    attr_accessor :with_gemset
 
     def shell
       @shell ||= Caliph.new
@@ -27,40 +30,115 @@ module Xing::CLI::Generators
       write_ruby_version "frontend"
       write_ruby_version "backend"
 
-      with_temporary_database_yml do
-        Bundler.with_clean_env do
-          shell.run(cmd("cd", target_name) &
-                    cmd("bundle", "install")).must_succeed!
+      if with_gemset
+        write_ruby_gemset
+        write_ruby_gemset "frontend"
+        write_ruby_gemset "backend"
+      end
+
+      write_database_yml
+      write_secrets_yml
 
-          shell.run(cmd("cd", File.join(target_name, "frontend")) &
-                    cmd("bundle", "install") &
-                    cmd("npm", "install")).must_succeed!
+      write_git_control_files
 
-          shell.run(cmd("cd", File.join(target_name, "backend")) &
-                    cmd("bundle", "install") &
-                    cmd("rake", "xing:install:migrations")).must_succeed!
+      Bundler.with_clean_env do
+        if with_gemset
+          bundler = shell.run(setup_env_command &
+            cmd("cd", target_name) &
+            cmd("gem", "install", "bundler"))
         end
+
+        shell.run(
+          setup_env_command &
+                  cmd("cd", target_name) &
+                  cmd("bundle", "install")).must_succeed!
+
+        shell.run(
+          setup_env_command &
+          cmd("cd", File.join(target_name, "frontend")) &
+                  cmd("bundle", "install") &
+                  cmd("npm", "install")).must_succeed!
+
+        shell.run(
+          setup_env_command &
+          cmd("cd", File.join(target_name, "backend")) &
+                  cmd("bundle", "install") &
+                  cmd("rake", "xing:install:migrations")).must_succeed!
       end
+
     end
 
-    def with_temporary_database_yml
+    def write_database_yml
       dbyml_path = File.join(target_name, "backend", "config", "database.yml")
-      if File.exist?(dbyml_path)
-        yield
-      else
-        begin
-          File.open(dbyml_path, "w"){}
-          yield
-        ensure
-          File.unlink(dbyml_path)
+      if !File.exist?(dbyml_path)
+        with_templates do |arc|
+          arc.copy file: "backend/config/database.yml", context: { app_name: target_name }
+          arc.copy file: "backend/config/database.yml.example", context: { app_name: target_name }
+          arc.copy file: "backend/config/database.yml.ci", context: { app_name: target_name }
+        end
+      end
+    end
+
+    def write_git_control_files
+      with_templates do |arc|
+        arc.copy file: "gitignore", as: ".gitignore"
+        arc.copy file: "backend/gitignore", as:"backend/.gitignore"
+        arc.copy file: "frontend/gitignore", as: "frontend/.gitignore"
+        arc.copy file: "gitattributes", as: ".gitattributes"
+        arc.copy file: "backend/gitattributes", as: "backend/.gitattributes"
+        arc.copy file: "frontend/gitattributes", as: "frontend/.gitattributes"
+      end
+    end
+
+    def write_secrets_yml
+      secyml_path = File.join(target_name, "backend", "config", "secrets.yml")
+      if !File.exist?(secyml_path)
+        context = {
+          dev_secret_key_base: SecureRandom.hex(64),
+          test_secret_key_base: SecureRandom.hex(64),
+          app_name: target_name
+        }
+        with_templates do |arc|
+          arc.copy file: "backend/config/secrets.yml", context: context
+          arc.copy file: "backend/config/secrets.yml.example", context: context
+          arc.copy file: "backend/config/secrets.yml.ci", context: context
         end
       end
     end
 
+    def with_templates
+      architecture source: File.expand_path('../../../../../default_configuration/templates/', __FILE__) , destination: target_name  do |arc|
+        yield(arc)
+      end
+    end
+
+    def write_file_to(name, subdir)
+      File.open(File.join(*([target_name] + subdir + [name])), "w") do |rv|
+        yield(rv)
+      end
+    end
+
     def write_ruby_version(*subdir)
-      File.open(File.join(*([target_name] + subdir + [".ruby-version"])), "w") do |rv|
+      write_file_to(".ruby-version", subdir) do |rv|
         rv.write(ruby_version)
       end
     end
+
+    def write_ruby_gemset(*subdir)
+      write_file_to(".ruby-gemset", subdir) do |rv|
+        rv.write(target_name)
+      end
+    end
+
+    def setup_env_command
+      if ENV['MY_RUBY_HOME'] && ENV['MY_RUBY_HOME'].include?('rvm')
+        args = [".", File.expand_path('../../../../../bin/xing-rvm-setup-env', __FILE__), ruby_version]
+        args[3] = target_name if with_gemset
+        cmd(*args)
+      else
+        # put other rb environemnt scripts here
+        cmd(":")
+      end
+    end
   end
 end

data/lib/xing/cli.rb

@@ -37,17 +37,19 @@ Global Options:
         opts = Trollop::options do
           opt :cms, "Include content management architecture. (coming soon)"
           opt :ruby_version, "Set the ruby version used for the new project (e.g. 2.2)", :type => :string
+          opt :with_gemset, "Define a gemset for use with RVM"
           stop_on ['name']
         end
         name = ARGV.shift
         Trollop::die "Please specify a project name with 'xing new <name>'" unless name
         Trollop::die "The CMS option is not yet implemented." if opts[:cms]
         if opts[:ruby_version].nil?
-          opts[:ruby_version] = RbConfig::CONFIG.values_at("MAJOR","MINOR").join(".")
+          opts[:ruby_version] = RUBY_VERSION
         end
         generator = Xing::CLI::Generators::NewProject.new
         generator.target_name = name
         generator.ruby_version = opts[:ruby_version]
+        generator.with_gemset = opts[:with_gemset]
         generator.generate
       else
         Trollop::die "Unknown command.  Supported commands are [" + SUPPORTED_VERBS.join(" ") + "]"