htcht 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec30c53f8e25b42c1b119536c829c434562aeb18
-  data.tar.gz: affeeb15ceb6c3cacbc4034150ba9e0d846269b2
+  metadata.gz: a1dcda9ce862bcb132b0c0c81b738aaf15ede5c8
+  data.tar.gz: 7008301db5e70a32d46a11daadff04c9b900e107
 SHA512:
-  metadata.gz: 578361f294a77e21773df29fb22b5b8ea250a615aea08eb609645cc82b095301685b6272b6f8864e375ba656a7851dcc10985ad042167c422c12be0baacf775b
-  data.tar.gz: 257d9920e4dfba6547988d88c05c46b5ceb955b36119f9b3fbcbd091000ff8edffbaf2ae2db9b6e9c8711433fcd6ad40416454538969035c10ca31b807b56724
+  metadata.gz: 8af195447abd1f753197b458c0c27aeca97c2f1db6b24810093d0ded3e70d78340c5fa81dd3642e3707034d43454bff854a357b1d84630676f22110fa9af5708
+  data.tar.gz: a7873e3ecf1c6678d0838b69d99e7027c543e241d6d309ec5e5f2c579b4f8409821b77b5f3d3319d3cffe14b9ff965e10fa540d0ccaa819952810140934317fd

data/Gemfile.lock

@@ -7,7 +7,39 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
+    aruba (0.14.2)
+      childprocess (~> 0.5.6)
+      contracts (~> 0.9)
+      cucumber (>= 1.3.19)
+      ffi (~> 1.9.10)
+      rspec-expectations (>= 2.99)
+      thor (~> 0.19)
+    builder (3.2.3)
+    childprocess (0.5.9)
+      ffi (~> 1.0, >= 1.0.11)
+    coderay (1.1.1)
+    contracts (0.15.0)
+    cucumber (2.4.0)
+      builder (>= 2.1.2)
+      cucumber-core (~> 1.5.0)
+      cucumber-wire (~> 0.0.1)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 4.0)
+      multi_json (>= 1.7.5, < 2.0)
+      multi_test (>= 0.1.2)
+    cucumber-core (1.5.0)
+      gherkin (~> 4.0)
+    cucumber-wire (0.0.1)
     diff-lcs (1.3)
+    ffi (1.9.18)
+    gherkin (4.1.1)
+    method_source (0.8.2)
+    multi_json (1.12.1)
+    multi_test (0.1.2)
+    pry (0.10.4)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
     rake (10.5.0)
     rspec (3.5.0)
       rspec-core (~> 3.5.0)
@@ -22,14 +54,17 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
+    slop (3.6.0)
     thor (0.19.4)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  aruba
   bundler (~> 1.13)
   htcht!
+  pry
   rake (~> 10.0)
   rspec (~> 3.5)
 

data/README.md

@@ -1,4 +1,5 @@
 # Htcht
+[![Gem Version](https://badge.fury.io/rb/htcht.svg)](https://badge.fury.io/rb/htcht)
 
 The internal CLI of Trim Agency. Used to setup new projects, build, test, etc.
 
@@ -16,9 +17,9 @@ Run ```htcht help``` for a list of commands.
 
 ## Development
 
-After checking out the repo, run `bin/setup` to install dependencies. You can also run `bin/console` for an interactive prompt that will allow you to experiment. Run `rake` to run the test suite.
+After checking out the repo, run `bin/setup` to install dependencies. You can also run `bin/console` for an interactive prompt that will allow you to experiment. Run `rspec` to run the test suite.
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+To install this gem onto your local machine, run `bundle exec rake install`.
 
 ## Contributing
 

data/htcht.gemspec

@@ -34,4 +34,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.13"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.5"
+  spec.add_development_dependency "aruba"
+  spec.add_development_dependency "pry"
 end

data/lib/htcht/cli/rails/BaseGemfile

@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
 
-ruby '2.3.3'
+ruby 'set_ruby_version'
 
-gem 'rails'
+gem 'rails', 'set_rails_version'

data/lib/htcht/cli/rails/Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:2.3.3
+FROM ruby:set_ruby_version
 MAINTAINER stevetwitte@gmail.com
 
 RUN apt-get update && apt-get install -y \
@@ -14,7 +14,7 @@ ENV LC_ALL en_US.UTF-8
 RUN mkdir -p /app
 WORKDIR /app
 
-RUN gem install rails
+RUN gem install rails --version set_rails_version
 #COPY Gemfile Gemfile.lock ./
 #RUN gem install bundler && bundle install --jobs 20 --retry 5
 

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

@@ -1,9 +1,16 @@
+require 'htcht/helpers/general_helpers'
+require 'htcht/helpers/name_helpers'
+require 'htcht/helpers/version_helpers'
+
 module Htcht
   module CLI
     module Rails
 
       class Rails < Thor
         include Thor::Actions
+        include Htcht::Helpers::GeneralHelpers
+        include Htcht::Helpers::NameHelpers
+        include Htcht::Helpers::VersionHelpers
 
         def self.source_root
           File.dirname(__FILE__)
@@ -14,23 +21,27 @@ module Htcht
         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]'
+        method_option :ruby_version, type: :string, :desc => "default: [latest version] Set the version of Ruby to be used."
+        method_option :rails_version, type: :string, :desc => "default: [latest version] Set the version of Rails to be used."
         def new(appname)
+          unless docker_running?
+            puts 'Check that Docker is installed and running'
+            return
+          end
+
+          options[:ruby_version] ||= latest_ruby
+          options[:rails_version] ||= latest_rails
 
           # 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
+          snake_name = snake_casify(appname)
 
           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[:init] && options[:api]
-            copy_file('templates/api_init_template.rb', "#{snake_name}/api_init_template.rb")
+            template_path = "#{snake_name}/api_init_template.rb"
+            copy_file('templates/api_init_template.rb', template_path)
             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")
@@ -38,15 +49,23 @@ module Htcht
             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")
             copy_file('templates/api_build_files/seeds.rb', "#{snake_name}/build_files/seeds.rb")
+            copy_file('templates/api_build_files/active_model_serializers.rb', "#{snake_name}/build_files/active_model_serializers.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"
+            template_path = "#{snake_name}/default_template.rb"
+            copy_file 'templates/default_template.rb', template_path
             rails_new_command.concat(' -m default_template.rb')
           end
 
+          if defined? template_path
+            add_app_names_to_template(path: template_path,
+                                      appname: appname,
+                                      snake_name: snake_name)
+          end
+
           # Copy this over so that Docker can run Rails new
           copy_file 'BaseGemfile', "#{snake_name}/Gemfile"
           rails_new_command.concat(' --force')
@@ -70,6 +89,11 @@ module Htcht
           empty_directory(snake_name)
           copy_file('docker-compose.yml', "#{snake_name}/docker-compose.yml")
           copy_file('Dockerfile', "#{snake_name}/Dockerfile")
+          gsub_file("#{snake_name}/Dockerfile", 'set_ruby_version', options[:ruby_version])
+          gsub_file("#{snake_name}/Dockerfile", 'set_rails_version', options[:rails_version])
+          gsub_file("#{snake_name}/Gemfile", 'set_ruby_version', options[:ruby_version])
+          gsub_file("#{snake_name}/Gemfile", 'set_rails_version', options[:rails_version])
+
 
           inside(snake_name) do
 
@@ -80,7 +104,7 @@ module Htcht
             run(rails_new_command)
 
             # Edit the Dockerfile and rebuild the app now that it has a Gemfile and Gemfile.lock
-            gsub_file('Dockerfile', 'RUN gem install rails', '#RUN gem install rails')
+            gsub_file('Dockerfile', "RUN gem install rails", '#RUN gem install rails')
             gsub_file('Dockerfile', '#COPY Gemfile Gemfile.lock ./', 'COPY Gemfile Gemfile.lock ./')
             gsub_file('Dockerfile', '#RUN gem install bundler && bundle install --jobs 20 --retry 5', 'RUN gem install bundler && bundle install --jobs 20 --retry 5')
             run('docker-compose build')
@@ -96,10 +120,15 @@ module Htcht
               remove_file("default_template.rb")
             end
           end
+        end
 
+        private
+
+        def add_app_names_to_template(path:, appname:, snake_name:)
+          gsub_file(path, 'set_appname', appname)
+          gsub_file(path, 'set_snake_name', snake_name)
         end
       end
     end
-
   end
 end

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

@@ -0,0 +1 @@
+ActiveModelSerializers.config.adapter = :json

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

@@ -45,18 +45,8 @@ end
 gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 
 # Setup the app config
-# But get the name first
-# TODO: Possible refactor (should be able to get the name from the gem?)
-# ----------------------------
-
-puts '**********'
-puts
-appname = ask("What should we call this new app? (CamelCasePlease)")
-snake_name = appname.gsub(/::/, '/').
-  gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
-  gsub(/([a-z\d])([A-Z])/,'\1_\2').
-  tr("-", "_").
-  downcase
+appname = "set_appname"
+snake_name = "set_snake_name"
 
 # Set the name of the app in application.rb
 gsub_file('config/application.rb', 'module App', "module #{appname}")
@@ -124,6 +114,7 @@ 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')
 copy_file('build_files/seeds.rb', 'db/seeds.rb')
+copy_file('build_files/active_model_serializers.rb', 'config/initializers/active_model_serializers.rb')
 empty_directory('db/seeds')
 empty_directory('db/seeds/development')
 empty_directory('db/seeds/test')

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

@@ -7,18 +7,8 @@ end
 gem 'pg'
 
 # Setup the app config
-# But get the name first
-# TODO: Possible refactor (should be able to get the name from the gem?)
-# ----------------------------
-
-puts '**********'
-puts
-appname = ask("What should we call this new app? (CamelCasePlease)")
-snake_name = appname.gsub(/::/, '/').
-  gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
-  gsub(/([a-z\d])([A-Z])/,'\1_\2').
-  tr("-", "_").
-  downcase
+appname = "set_appname"
+snake_name = "set_snake_name"
 
 # Set the name of the app in application.rb
 gsub_file('config/application.rb', 'module App', "module #{appname}")
@@ -32,4 +22,3 @@ gsub_file('config/database.yml', 'username: app', "username: #{snake_name}")
 gsub_file('config/database.yml', 'APP_DATABASE_PASSWORD', "#{snake_name.upcase}_DATABASE_PASSWORD")
 
 run('bundle install')
-

data/lib/htcht/helpers/general_helpers.rb

@@ -0,0 +1,12 @@
+module Htcht
+  module Helpers
+
+    module GeneralHelpers
+
+      def docker_running?
+        #TODO: look for a better way to do this
+        system('docker ps')
+      end
+    end
+  end
+end

data/lib/htcht/helpers/name_helpers.rb

@@ -0,0 +1,15 @@
+module Htcht
+  module Helpers
+    module NameHelpers
+
+      def snake_casify(name)
+        name.gsub(/::/, '/').
+          gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
+          gsub(/([a-z\d])([A-Z])/,'\1_\2').
+          gsub(/\s+/, '_').
+          tr("-", "_").
+          downcase
+      end
+    end
+  end
+end

data/lib/htcht/helpers/version_helpers.rb

@@ -0,0 +1,20 @@
+module Htcht
+  module Helpers
+    module VersionHelpers
+
+      def latest_ruby
+        # This is going to be hard coded for now because I can't seem to
+        # find a public api for getting the latest version of Ruby
+        '2.4.1'
+      end
+
+      def latest_rails
+        # The rubygems.org API does allow you to get the latest version
+        # of Rails but it is a private api (see above comment as well)
+        '5.0.2'
+      end
+
+    end
+  end
+end
+

data/lib/htcht/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: htcht
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Trim Agency
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-19 00:00:00.000000000 Z
+date: 2017-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -66,6 +66,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.5'
+- !ruby/object:Gem::Dependency
+  name: aruba
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - info@trimagency.com
@@ -90,6 +118,7 @@ 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_build_files/active_model_serializers.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
@@ -99,6 +128,9 @@ files:
 - 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/helpers/general_helpers.rb
+- lib/htcht/helpers/name_helpers.rb
+- lib/htcht/helpers/version_helpers.rb
 - lib/htcht/main.rb
 - lib/htcht/version.rb
 homepage: https://github.com/TrimAgency/htcht