daiku 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e8b05bc97a7765ef02bad3f80967d180967e14d
-  data.tar.gz: 286c391924557281a930f595163eb5d9239f8e39
+  metadata.gz: 5dd1097cb00c2e89d1d4ac2ef0c7d7507951d849
+  data.tar.gz: 65357c4faee3832c917bd05291e95df1c8a731dd
 SHA512:
-  metadata.gz: eb28349484e0b914c839bef30de734bd368f0b63696f26d0cb616e90d0a3e4872f13d727bd215c47fafd527c9397fd3406af74131ca8a9d0cb7b7e4efb8ef90e
-  data.tar.gz: cc7715bd90bceb56eba923207c281b54b7069b68a8bfe9b5442bd0de362b3d28001a9f91639e661ea5ad87ee699f30a1c406813acac87923700cd05beaf6fba9
+  metadata.gz: bb8d0624c0f23c8c6ea9b17d1bba949bbefb54092d2f585f68056fbdd3953bc337f99990459abcb8dddce675e91e35fac90a10c2291763b81f3dc06db36a5fb6
+  data.tar.gz: b77e23dd95b9444e40358f34d8065405ccb9a162707efb30ae5685e968424738637e868d2d744505be98875adb88eea6c7bf40cf894d75466499f4035e4dfbcd

data/README.md

@@ -23,6 +23,13 @@ To generate a basic app, run the `new` command, passing it the port your local s
     $ bundle exec foreman start
     $ open http://localhost:5000
 
+
+Or as a oneliner:
+
+    daiku new myapp --port 5000 && cd myapp && bundle install && bundle exec foreman start
+
+Then visit `http://localhost:5000` in your browser.
+
 ### Options
 
 You can further customize the app that's generated by passing additional options. The built-in help system explains the available options.
@@ -32,29 +39,33 @@ You can further customize the app that's generated by passing additional options
       daiku new APP -p, --port=N
 
     Options:
-      -p, --port=N                                             # Port this app should run on locally.
-          [--ruby-version=RUBY_VERSION]                        # Specify the version of ruby this project should use.
-                                                               # Default: 2.1.2
-      -m, [--models=MODELS]                                    # Choose the data modeling tool this project uses.
-                                                               # Default: datamapper
-                                                               # Possible values: datamapper, none
-      -a, [--assets=ASSETS]                                    # Choose the assets workflow this project uses.
-                                                               # Default: grunt
-                                                               # Possible values: grunt, none
-          [--honeybadger-private-key=HONEYBADGER-PRIVATE-KEY]  # Honeybadger Private API Key
-          [--honeybadger-public-key=HONEYBADGER-PUBLIC-KEY]    # Honeybadger Private API Key
-          [--no-newrelic]                                      # Don't use New Relic.
-          [--with-vcr]                                         # Include `vcr` in this project's TDD stack.
-          [--with-sidekiq]                                     # Set this project up to use `sidekiq` for background processing.
-
-Generate a new application with daiku
-
+      -p, --port=N               # Port this app should run on locally.
+          [--ruby=RUBY]          # Specify the version of ruby this project should use.
+                                # Default: 2.1.5
+          [--node=NODE]          # Specify the version of node this project should use (for grunt, etc).
+                                # Default: v0.10.33
+      -a, [--assets=ASSETS]      # Choose the assets workflow this project uses.
+                                # Possible values: grunt
+      -e, [--errors=ERRORS]      # Choose the error reporting lib this project uses.
+                                # Possible values: honeybadger
+      -j, [--jobs=JOBS]          # Choose the background jobs lib this project uses.
+                                # Possible values: sidekiq
+      -m, [--models=MODELS]      # Choose the data modeling lib this project uses.
+                                # Possible values: datamapper
+      -M, [--monitors=MONITORS]  # Choose the monitoring lib this project uses.
+                                # Possible values: newrelic
+          [--vcr]                # Include `vcr` in this project's BDD stack?
+          [--sql]                # SQL or No-SQL? If SQL, assumes postgresql
+                                # Default: true
+          [--version]
+
+    Generate a new application with daiku
 
 ### Example
 
 Consider the following example:
 
-    $ daiku new myapp -p 5000 -m datamapper -a grunt --with-vcr --with-sidekiq
+    $ daiku new myapp --port 5000 --models datamapper --assets grunt --errors honeybadger --monitors newrelic --jobs sidekiq --vcr
 
 This will generate the following app:
 
@@ -95,7 +106,7 @@ myapp
 ├── bower.json
 ├── config
 │   ├── datamapper.rb
-│   ├── honeybadger.rb
+│   ├── pony.rb
 │   ├── puma.rb
 │   └── sidekiq.rb
 ├── config.ru
@@ -120,6 +131,7 @@ myapp
 ├── public
 │   ├── assets
 │   │   └── .gitkeep
+│   ├── favicon.ico
 │   └── fonts
 │       └── .gitkeep
 ├── spec

data/lib/daiku/_app/.node-version.tt

@@ -0,0 +1 @@
+<%= @node -%>

data/lib/daiku/_app/.slugignore

@@ -1,5 +1,5 @@
 .env
-.ssl
 .certs
 .ssl
 ./assets
+./spec

data/lib/daiku/_app/Gemfile.tt

@@ -36,3 +36,7 @@ group :development, :test do
   gem 'foreman', require: false
   gem 'dotenv'
 end
+
+group :assets do
+  gem 'sass'
+end

data/lib/daiku/_app/config.ru.tt

@@ -21,5 +21,4 @@ use Rack::Deflater
 use Rack::Runtime
 
 # make the jump
-run app
-
+run App

data/lib/daiku/_app/spec/spec_helper.rb

@@ -1,12 +1,11 @@
 # encoding: utf-8
 ENV['RACK_ENV'] = 'test'
 dbuser = (ENV['TRAVIS']) ? 'postgres@' : nil
-ENV['DATABASE_URL'] = "postgres://#{dbuser}localhost/#{ENV['DB_NAME']}"
+ENV['DB_NAME_TEST'] = "#{ENV['DB_NAME']}_test"
+ENV['DATABASE_URL'] = "postgres://#{dbuser}localhost/#{ENV['DB_NAME_TEST']}"
 lib_path = File.expand_path('../../lib', __FILE__)
 ($:.unshift lib_path) unless ($:.include? lib_path)
 require 'boot'
 Bundler.setup(:test)
-DatabaseCleaner.strategy = :truncation
-require 'sidekiq/testing'
 require 'minitest/autorun'
 MiniTest::Reporters.use! MiniTest::Reporters::SpecReporter.new

data/lib/daiku/_app/views/layout.slim

@@ -16,8 +16,5 @@ html
     meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"
     meta name="HandheldFriendly" content="True"
     meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no"
-    link rel="stylesheet" type="text/css" href="/assets/app.css"
-    script src="/assets/html5shiv.js"
   body
     == yield
-    script src="/assets/app.js"

data/lib/daiku/cli.rb

@@ -14,7 +14,7 @@ module Daiku
     desc "new APP", "Generate a new application with daiku"
     method_option :port, required: true, aliases: '-p', type: :numeric, desc: 'Port this app should run on locally.'
     method_option :ruby, default: '2.1.5', desc: 'Specify the version of ruby this project should use.'
-    method_option :node, default: 'v0.10.33', desc: 'Specify the version of node this project should use.'
+    method_option :node, default: 'v0.10.33', desc: 'Specify the version of node this project should use (for grunt, etc).'
     method_option :assets, aliases: '-a', desc: 'Choose the assets workflow this project uses.', enum: Daiku::Plugins.plugin_names('assets')
     method_option :errors, aliases: '-e', desc: 'Choose the error reporting lib this project uses.', enum: Daiku::Plugins.plugin_names('errors')
     method_option :jobs, aliases: '-j', desc: 'Choose the background jobs lib this project uses.', enum: Daiku::Plugins.plugin_names('jobs')
@@ -26,6 +26,7 @@ module Daiku
       @app    = app
       @port   = options[:port]
       @ruby   = options[:ruby]
+      @node   = options[:node]
       @models = options[:models]
       @assets = options[:assets]
       @jobs   = options[:jobs]

data/lib/daiku/plugins/database-sql/cli.rb

@@ -16,10 +16,10 @@ module Daiku
         end
 
         def dotenv
-          dbname = options.fetch(:'db-name') { "postgres://localhost/#{app}" }
-          dburl  = options.fetch(:'db-url') { app }
-          append_to_file "#{app}/.env", "DATABASE_NAME=#{dbname}"
-          append_to_file "#{app}/.env", "DATABASE_URL=#{dburl}"
+          dbname  = options.fetch(:'db-url') { app }
+          dburl = options.fetch(:'db-name') { "postgres://localhost/#{app}" }
+          append_to_file "#{app}/.env", "DATABASE_NAME=#{dbname}\n"
+          append_to_file "#{app}/.env", "DATABASE_URL=#{dburl}\n"
         end
 
         def config
@@ -30,6 +30,10 @@ module Daiku
           insert_into_file "#{app}/Gemfile", "  gem 'database_cleaner'\n", after: "group :test do\n"
         end
 
+        def spechelper
+          insert_into_file "#{app}/spec/spec_helper.rb", "DatabaseCleaner.strategy = :truncation\n", after: "Bundler.setup(:test)\n"
+        end
+
         def travisyml
           insert_into_file "#{app}/.travis.yml", "  - postgresql\n", after: "services:\n"
           insert_into_file "#{app}/.travis.yml", "  postgresql: 9.3\n", after: "addons:\n"

data/lib/daiku/plugins/grunt/_config/sass.coffee

@@ -1,7 +1,7 @@
 module.exports =
   default:
-    files: 'public/assets/main.css': [
-      'assets/stylesheets/main.scss'
+    files: 'public/assets/app.css': [
+      'assets/stylesheets/app.scss'
     ]
     options:
       style: 'expanded'

data/lib/daiku/plugins/grunt/_config/uglify.coffee

@@ -8,8 +8,8 @@ module.exports =
         'assets/vendor/jquery/dist/jquery.js'
         'assets/vendor/underscore/underscore.js'
       ]
-      'public/assets/main.js': [
-        'public/assets/main.js'
+      'public/assets/app.js': [
+        'public/assets/app.js'
       ]
     options:
       beautify: true

data/lib/daiku/plugins/grunt/_templates/bower.json.tt

@@ -3,6 +3,6 @@
   "dependencies": {
     "jquery": "~2.1.0",
     "underscore": "~1.7.0",
-    "html5shiv": "~3.7.2",
+    "html5shiv": "~3.7.2"
   }
 }

data/lib/daiku/plugins/grunt/_templates/package.json.tt

@@ -3,16 +3,17 @@
   "version": "0.0.1",
   "private": true,
   "dependencies": {
-    "grunt": "~0.4.2",
-    "grunt-contrib-coffee": "~0.10.1",
-    "grunt-contrib-imagemin": "~0.4.0",
-    "grunt-contrib-sass": "~0.7.2",
-    "grunt-contrib-uglify": "~0.3.2",
-    "grunt-newer": "~0.6.1",
+    "grunt-cli": "~0.1.13",
+    "grunt": "~0.4.5",
+    "grunt-contrib-coffee": "~0.12.0",
+    "grunt-contrib-imagemin": "~0.9.2",
+    "grunt-contrib-sass": "~0.8.1",
+    "grunt-contrib-uglify": "~0.6.0",
+    "grunt-newer": "~0.8.0",
     "grunt-robots-txt": "~0.3.0",
     "grunt-slim": "^0.1.0",
-    "load-grunt-config": "~0.7.1",
-    "load-grunt-tasks": "~0.3.0",
-    "time-grunt": "~0.2.9"
+    "load-grunt-config": "~0.16.0",
+    "load-grunt-tasks": "~1.0.0",
+    "time-grunt": "~1.0.0"
   }
 }

data/lib/daiku/plugins/grunt/cli.rb

@@ -20,6 +20,12 @@ module Daiku
           template '_templates/package.json.tt', "#{app}/package.json"
           directory '_config', "#{app}/.grunt"
         end
+
+        def layout
+          insert_into_file "#{app}/views/layout.slim", %Q(    link rel="stylesheet" type="text/css" href="/assets/app.css"\n), before: "  body\n"
+          insert_into_file "#{app}/views/layout.slim", %Q(    script src="/assets/html5shiv.js"\n), before: "  body\n"
+          insert_into_file "#{app}/views/layout.slim", %Q(    script src="/assets/app.js"\n), after: "    == yield\n"
+        end
       end
     end
   end

data/lib/daiku/plugins/sidekiq/cli.rb

@@ -41,12 +41,17 @@ module Daiku
             require 'sidekiq/web'
             map '/sidekiq' do
               Sidekiq::Web.use Rack::Auth::Basic do |username, password|
-              username == ENV['SIDEKIQ_USERNAME'] && password == ENV['SIDEKIQ_PASSWORD']
+                username == ENV['SIDEKIQ_USERNAME'] && password == ENV['SIDEKIQ_PASSWORD']
+              end
+              run Sidekiq::Web\n
             end
-            run Sidekiq::Web
           SKMW
           append_to_file "#{app}/config.ru", content
         end
+
+        def spechelper
+          insert_into_file "#{app}/spec/spec_helper.rb", "require 'sidekiq/testing'\n", before: "require 'minitest/autorun'\n"
+        end
       end
     end
   end

data/lib/daiku/version.rb

@@ -1,3 +1,3 @@
 module Daiku
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: daiku
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Eric Marden
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-10 00:00:00.000000000 Z
+date: 2014-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -70,7 +70,7 @@ files:
 - lib/daiku.rb
 - lib/daiku/_app/.env.tt
 - lib/daiku/_app/.gitignore
-- lib/daiku/_app/.node-version
+- lib/daiku/_app/.node-version.tt
 - lib/daiku/_app/.ruby-version.tt
 - lib/daiku/_app/.slugignore
 - lib/daiku/_app/.travis.yml.tt
@@ -96,6 +96,7 @@ files:
 - lib/daiku/_app/lib/tasks/.gitkeep
 - lib/daiku/_app/lib/values/.gitkeep
 - lib/daiku/_app/public/assets/.gitkeep
+- lib/daiku/_app/public/favicon.ico
 - lib/daiku/_app/public/fonts/.gitkeep
 - lib/daiku/_app/spec/app_spec.rb
 - lib/daiku/_app/spec/models/.gitkeep
@@ -123,7 +124,7 @@ files:
 - lib/daiku/plugins/grunt/_config/uglify.coffee
 - lib/daiku/plugins/grunt/_templates/.bowerrc
 - lib/daiku/plugins/grunt/_templates/.bowerrc.tt
-- lib/daiku/plugins/grunt/_templates/Gruntfile.coffee
+- lib/daiku/plugins/grunt/_templates/Gruntfile.coffee.tt
 - lib/daiku/plugins/grunt/_templates/bower.json.tt
 - lib/daiku/plugins/grunt/_templates/package.json.tt
 - lib/daiku/plugins/grunt/cli.rb

data/lib/daiku/_app/.node-version

@@ -1 +0,0 @@
-<%= @node %>