htcht 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1cd0938dd3865ec3f78ada3ab31fefc2cf787e3
-  data.tar.gz: 9b31904115879870d955d83f26dd68e1275c137e
+  metadata.gz: ec30c53f8e25b42c1b119536c829c434562aeb18
+  data.tar.gz: affeeb15ceb6c3cacbc4034150ba9e0d846269b2
 SHA512:
-  metadata.gz: 5b90731d79df2cc8d8909a36de66743fc95716b9e0a71ae95015f17994b5afb5646442e2d08d235243fb0baff9cffe149880dac2d7de7729aa24955c3200dd69
-  data.tar.gz: 616b60ba20f6c299e04c328a91e7e32b7fc81c1e0bb3cf657c514f0db5f63b3be93982784ab7692d2b6cc3a4ca7fae912430145aa5999cf066e9d23805ccb011
+  metadata.gz: 578361f294a77e21773df29fb22b5b8ea250a615aea08eb609645cc82b095301685b6272b6f8864e375ba656a7851dcc10985ad042167c422c12be0baacf775b
+  data.tar.gz: 257d9920e4dfba6547988d88c05c46b5ceb955b36119f9b3fbcbd091000ff8edffbaf2ae2db9b6e9c8711433fcd6ad40416454538969035c10ca31b807b56724

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    htcht (0.1.0)
-      thor
+    htcht (0.1.1)
+      thor (~> 0.1)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -4,6 +4,8 @@ The internal CLI of Trim Agency. Used to setup new projects, build, test, etc.
 
 ## Installation
 
+Htcht requires Docker and has only been tested on MacOS.
+
 Run this command to install
 
     $ gem install htcht
@@ -20,7 +22,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/htcht. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at https://github.com/TrimAgency/htcht. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
 
 ## License

data/lib/htcht/cli/rails/rails.rb

@@ -11,34 +11,36 @@ module Htcht
 
         desc 'new AppName', 'Create a new base Rails App inside a Docker Container with Postgres setup as the database.'
         method_option :verbose, type: :boolean, default: false, :aliases => '-v', :desc => 'default: [--no-verbose] By default rails new will be run with the quiet flag, this turns it off.'
-        method_option :api, type: :boolean, default: false, :desc => 'default: [--no-api] Generate Rails App in API mode.'
-        method_option :bootstrap, type: :boolean, default: false, :desc => 'default: [--no-bootstrap] Generate a base Rails app with custom Gemfile and configs. (This along with "--api" is the base for new Rails APIs at Trim Agency).'
+        method_option :api, type: :boolean, default: false, :aliases => '-a', :desc => 'default: [--no-api] Generate Rails App in API mode.'
+        method_option :init, type: :boolean, default: false, :aliases => '-i', :desc => 'default: [--no-init] Generate a base Rails app with custom Gemfile and configs. (This along with "--api" is the base for new Rails APIs at Trim Agency).'
         method_option :test, type: :boolean, default: false, :desc => 'default: [--no-test]'
         def new(appname)
 
           # Format the appname as snake case for folders, etc.
           # This code is taken straight from Rails
+          # TODO: Move to a helper file
           snake_name = appname.gsub(/::/, '/').
             gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
             gsub(/([a-z\d])([A-Z])/,'\1_\2').
             tr("-", "_").
             downcase
 
-          rails_new_command = 'docker-compose run app rails new . --database=postgresql -T --skip-bundle'
+          rails_new_command = 'docker-compose run app rails new . --database=postgresql --skip-bundle'
 
           # Set the application template
           # TODO: Refactor to be dynamic from a directory
-          if options[:bootstrap] && options[:api]
-            copy_file('templates/api_bootstrap_template.rb', "#{snake_name}/api_bootstrap_template.rb")
+          if options[:init] && options[:api]
+            copy_file('templates/api_init_template.rb', "#{snake_name}/api_init_template.rb")
             copy_file('templates/api_build_files/user_spec.rb', "#{snake_name}/build_files/user_spec.rb")
             copy_file('templates/api_build_files/users.rb', "#{snake_name}/build_files/users.rb")
             copy_file('templates/api_build_files/email_validator.rb', "#{snake_name}/build_files/email_validator.rb")
             copy_file('templates/api_build_files/factory_girl.rb', "#{snake_name}/build_files/factory_girl.rb")
             copy_file('templates/api_build_files/shoulda_matchers.rb', "#{snake_name}/build_files/shoulda_matchers.rb")
             copy_file('templates/api_build_files/rails_helper.rb', "#{snake_name}/build_files/rails_helper.rb")
-            rails_new_command.concat(' -m api_bootstrap_template.rb')
-          elsif options[:bootstrap]
-            puts "--bootstrap must be used with --api for now. This is on it's way"
+            copy_file('templates/api_build_files/seeds.rb', "#{snake_name}/build_files/seeds.rb")
+            rails_new_command.concat(' -m api_init_template.rb -T')
+          elsif options[:init]
+            puts "--init must be used with --api for now."
             return
           else
             copy_file 'templates/default_template.rb', "#{snake_name}/default_template.rb"
@@ -86,7 +88,15 @@ module Htcht
             run('docker-compose run app rake db:create')
             run('docker-compose run app rake db:migrate')
 
+            # Clean up the template and build files
+            if options[:init] && options[:api]
+              remove_file("api_init_template.rb")
+              remove_dir("build_files/")
+            else
+              remove_file("default_template.rb")
+            end
           end
+
         end
       end
     end

data/lib/htcht/cli/rails/templates/api_build_files/seeds.rb

@@ -0,0 +1,19 @@
+# This file should contain all the record creation needed to seed the database with its default values.
+# The data can then be loaded with the rails db:seed command (or created alongside the database with db:setup).
+#
+# Enviroment Specific Seed data is handled with the seedbank gem and follows this structure
+#
+# db/seeds/
+#   bar.seeds.rb
+#   development/
+#     users.seeds.rb
+#   foo.seeds.rb
+#
+# This would generate the following Rake tasks
+#
+# rake db:seed                    Load the seed data from db/seeds.rb, db/seeds/*.seeds.rb and db/seeds/ENVIRONMENT/*.seeds.rb. ENVIRONMENT is the current environment in Rails.env.
+# rake db:seed:bar                Load the seed data from db/seeds/bar.seeds.rb
+# rake db:seed:common             Load the seed data from db/seeds.rb and db/seeds/*.seeds.rb.
+# rake db:seed:development        Load the seed data from db/seeds.rb, db/seeds/*.seeds.rb and db/seeds/development/*.seeds.rb.
+# rake db:seed:development:users  Load the seed data from db/seeds/development/users.seeds.rb
+# rake db:seed:original           Load the seed data from db/seeds.rb

data/lib/htcht/cli/rails/templates/{api_bootstrap_template.rb → api_init_template.rb}

@@ -73,13 +73,21 @@ run('bundle install')
 
 # Setup Rspec for Testing
 # ----------------------------
-
 run('rails generate rspec:install')
 
+# Setup Figaro for ENV
+# ----------------------------
+run('bundle exec figaro install')
+
+# Setup Knock for JWT
+# ----------------------------
+run('rails generate knock:install')
+run('rails generate knock:token_controller user')
+insert_into_file("app/controllers/application_controller.rb", "\s\sinclude Knock::Authenticable\n", :after => "class ApplicationController < ActionController::API\n")
+
 # Generate User Model
 # and add validations to user.rb
 # ----------------------------
-
 generate(:model, 'User', 'email:uniq:index', 'password:digest')
 user_migration = Dir.glob('db/migrate/*.rb')[0].to_s
 gsub_file(user_migration, 't.string :email', 't.string :email, null: false')
@@ -106,6 +114,8 @@ insert_into_file('app/models/user.rb', after: 'has_secure_password') do
 )
 end
 
+# Copy remaining files to their respective locations
+# ----------------------------
 remove_file('spec/models/user_spec.rb')
 copy_file('build_files/user_spec.rb', 'spec/models/user_spec.rb')
 copy_file('build_files/users.rb', 'spec/factories/users.rb')
@@ -113,5 +123,7 @@ copy_file('build_files/email_validator.rb', 'app/validators/email_validator.rb')
 copy_file('build_files/factory_girl.rb', 'spec/support/factory_girl.rb')
 copy_file('build_files/rails_helper.rb', 'spec/rails_helper.rb')
 copy_file('build_files/shoulda_matchers.rb', 'spec/support/shoulda_matchers.rb')
-remove_dir('build_files/')
-
+copy_file('build_files/seeds.rb', 'db/seeds.rb')
+empty_directory('db/seeds')
+empty_directory('db/seeds/development')
+empty_directory('db/seeds/test')

data/lib/htcht/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: htcht
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Trim Agency
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-18 00:00:00.000000000 Z
+date: 2017-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -90,13 +90,14 @@ files:
 - lib/htcht/cli/rails/Dockerfile
 - lib/htcht/cli/rails/docker-compose.yml
 - lib/htcht/cli/rails/rails.rb
-- lib/htcht/cli/rails/templates/api_bootstrap_template.rb
 - lib/htcht/cli/rails/templates/api_build_files/email_validator.rb
 - lib/htcht/cli/rails/templates/api_build_files/factory_girl.rb
 - lib/htcht/cli/rails/templates/api_build_files/rails_helper.rb
+- lib/htcht/cli/rails/templates/api_build_files/seeds.rb
 - lib/htcht/cli/rails/templates/api_build_files/shoulda_matchers.rb
 - lib/htcht/cli/rails/templates/api_build_files/user_spec.rb
 - lib/htcht/cli/rails/templates/api_build_files/users.rb
+- lib/htcht/cli/rails/templates/api_init_template.rb
 - lib/htcht/cli/rails/templates/default_template.rb
 - lib/htcht/main.rb
 - lib/htcht/version.rb