roro 0.1.8 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2fd99041d3fc58490436c693562ed8b2aac43ad58c492c769d8d9a7a531cd43a
-  data.tar.gz: c9f502e178065b74abaf62392ed0e5e32561cd0587b3f45f9b58fcd26579df40
+  metadata.gz: bfd78ef569986a19d39fee52986e898ecb337fdc464fc43c4429707a9f6e1f02
+  data.tar.gz: ecfb5bd59dfb86a1c8ecf6595d9b9531ce96c0b34dd80cbc301d7a96f0b31ae6
 SHA512:
-  metadata.gz: f7b77078cb0b27c8fc791617391e7844a00229b4dea43381e58724e72563db9bbc5a1f7ae8763a89ecf91c823ec0d4e6cf4962b237237f49bbc49975db90a1bf
-  data.tar.gz: ea146b49bc3f05266e54b8742da55318d50bb1e3bf346570939dda8e6100aef07c9f9f1c440b9446a25aeb291aa3ce23c882e057e4e7554bff985a37e7933b3d
+  metadata.gz: 8ff4aefc9790bd38e62848f10933ef73fdbf3c0acd9b0f70ea76845cdc5f6b3cf195b487b844040e99ff34fd302f8969b937db6b1bab3d475207a23c32f8af3a
+  data.tar.gz: a1a1115b7a87f71a6e16f62571c2dceb91555393528c92ffad1947860a081a4ced1c5d78c836892ece515bfe951c72f21b3488150f55a05d93fb3a769ea4064f

data/.circleci/config.yml

@@ -32,6 +32,8 @@ jobs:
     machine: true
     steps:
       - checkout
+      - run: gem install bundler
+
       - run: bundle
       - run: rake install
       - run:
@@ -39,14 +41,18 @@ jobs:
           working_directory: sooperdooper
           command: |
             bundle
+            sleep 2s
             rake install
+            sleep 5s
             roro greenfield
+            sleep 5s
             curl -Is localhost:3000 | head -n 1
 
   acceptance-rollon:
     machine: true
     steps:
       - checkout
+      - run: gem install bundler
       - run: bundle
       - run: rake install
       - run:
@@ -94,14 +100,7 @@ jobs:
       - run: roro expose
       - run: echo 'source docker/env_files/circleci.env' >> $BASH_ENV
       - run: bash .circleci/setup-gem-credentials.sh
-      - run: git config credential.helper 'cache --timeout=120'
-      - run: git config user.email $GIT_EMAIL
-      - run: git config user.name $GIT_NAME
       - run: gem install gem-release
-      - run: git add .
-      - run: git commit -m "Updated Gemfile.lock via CircleCI"
-      - run: git checkout -b release
-      - run: git push -q --force https://${GITHUB_PERSONAL_TOKEN}@github.com/schadenfred/roro.git release
       - run: gem release
 
 workflows:
@@ -143,24 +142,19 @@ workflows:
               only:
                 - development
                 - master
+
   release:
     jobs:
       - build:
           filters:
-            branches:
-              only:
-                - development
+            tags:
+              only: /.*/
       - release:
-          # requires:
-          #   - test-all-rubies
-          #   - acceptance-greenfield
-          #   - acceptance-rollon
           filters:
+            tags:
+              only: /^v.*/
             branches:
-              only:
-                - master
-            # tags:
-            #   only: /^v.*/
+              ignore: /.*/
 
 
 

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    roro (0.1.8)
-      handsome_fencer-crypto (= 0.1.4)
+    roro (0.2.0)
+      handsome_fencer-crypto (= 0.1.6)
       os
       sshkit
       thor
@@ -31,7 +31,6 @@ GEM
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
     builder (3.2.3)
-    byebug (10.0.2)
     coderay (1.1.2)
     concurrent-ruby (1.1.4)
     crass (1.0.4)
@@ -62,7 +61,7 @@ GEM
     guard-minitest (2.4.6)
       guard-compat (~> 1.2)
       minitest (>= 3.0)
-    handsome_fencer-crypto (0.1.4)
+    handsome_fencer-crypto (0.1.6)
       guard
       guard-minitest
     handsome_fencer-test (0.1.1)
@@ -105,7 +104,7 @@ GEM
     nenv (0.3.0)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
-    net-ssh (5.1.0)
+    net-ssh (5.2.0)
     nokogiri (1.9.1)
       mini_portile2 (~> 2.4.0)
     notiffany (0.1.1)
@@ -145,7 +144,7 @@ GEM
     shoulda-matchers (3.1.2)
       activesupport (>= 4.0.0)
     sorcerer (1.0.2)
-    sshkit (1.18.0)
+    sshkit (1.18.2)
       net-scp (>= 1.1.2)
       net-ssh (>= 2.8.0)
     thor (0.20.3)
@@ -158,7 +157,6 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.17)
-  byebug
   handsome_fencer-test
   rake (~> 10.0)
   roro!

data/Guardfile

@@ -1,19 +1,6 @@
 # A sample Guardfile
 # More info at https://github.com/guard/guard#readme
 
-## Uncomment and set this to only include directories you want to watch
-# directories %w(app lib config test spec features) \
-#  .select{|d| Dir.exist?(d) ? d : UI.warning("Directory #{d} does not exist")}
-
-## Note: if you are using the `directories` clause above and you are not
-## watching the project directory ('.'), then you will want to move
-## the Guardfile to a watched dir and symlink it back, e.g.
-#
-#  $ mkdir config
-#  $ mv Guardfile config/
-#  $ ln -s config/Guardfile .
-#
-# and, you'll have to watch "config/Guardfile" instead of "Guardfile"
 options = {
   cli: '',
   all_after_run: false
@@ -21,32 +8,13 @@ options = {
 
 guard :minitest, options do
   # with Minitest::Unit
+
   watch(%r{^test/(.*)\/?test_(.*)\.rb$})
   watch(%r{^test/(.*)\/?(.*)_test\.rb$})
-  watch(%r{^lib/(.*/)?([^/]+)\.rb$})     { |m| "test/#{m[1]}test_#{m[2]}.rb" }
+  watch(%r{^lib/roro/cli/(.+)\.rb$}) { |m| "test/generators/#{m[1]}_test.rb" }
 
-  watch(%r{^lib/roro/cli/ruby_gem.rb$})     { |m| "test/generators/ruby_gem_test.rb" }
-  # watch(%r{^lib/(.*/)?([^/]+)\.rb$})     { 'test' }
-  watch(%r{^test/test_helper\.rb$})      { 'test' }
   watch(%r{^test/thor_helper\.rb$})      { 'test' }
 
-  watch(%r{^test/fixtures/files/(.*/)?([^/]+)\.yml$})     { 'test/generators/ruby_gem_test.rb' }
-  # with Minitest::Spec
-  # watch(%r{^spec/(.*)_spec\.rb$})
-  # watch(%r{^lib/(.+)\.rb$})         { |m| "spec/#{m[1]}_spec.rb" }
-  # watch(%r{^spec/spec_helper\.rb$}) { 'spec' }
-
-  # Rails 4
-  # watch(%r{^app/(.+)\.rb$})                               { |m| "test/#{m[1]}_test.rb" }
-  # watch(%r{^app/controllers/application_controller\.rb$}) { 'test/controllers' }
-  # watch(%r{^app/controllers/(.+)_controller\.rb$})        { |m| "test/integration/#{m[1]}_test.rb" }
-  # watch(%r{^app/views/(.+)_mailer/.+})                    { |m| "test/mailers/#{m[1]}_mailer_test.rb" }
-  # watch(%r{^lib/(.+)\.rb$})                               { |m| "test/lib/#{m[1]}_test.rb" }
-  # watch(%r{^test/.+_test\.rb$})
-  # watch(%r{^test/test_helper\.rb$}) { 'test' }
+  watch(%r{^test/fixtures/files/(.*/)?([^/]+)\.yml$})     { 'test' }
 
-  # Rails < 4
-  # watch(%r{^app/controllers/(.*)\.rb$}) { |m| "test/functional/#{m[1]}_test.rb" }
-  # watch(%r{^app/helpers/(.*)\.rb$})     { |m| "test/helpers/#{m[1]}_test.rb" }
-  # watch(%r{^app/models/(.*)\.rb$})      { |m| "test/unit/#{m[1]}_test.rb" }
 end

data/lib/roro/cli/greenfield.rb

@@ -1,4 +1,5 @@
 require 'os'
+
 module Roro
 
   class CLI < Thor
@@ -13,20 +14,83 @@ module Roro
 
     def greenfield
 
-      if !Dir['./*'].empty? && options["force"].nil?
-        raise Roro::Error.new("Oops -- Roro can't greenfield a new Rails app for you unless the current directory is empty.")
-      end
+      confirm_dependencies
       copy_greenfield_files
-      system 'sudo docker-compose run web rails new . --force --database=postgresql --skip-bundle'
-      system 'sudo chown -R $USER .' if OS.linux?
-      # own_if_required
-      system 'sudo docker-compose build'
-      # own_if_required
-      system 'mv -f config/database.yml.example config/database.yml'
-      # own_if_required
-      system 'sudo docker-compose up --build --force-recreate -d '
-      # own_if_required
-      system 'sudo docker-compose run web bin/rails db:create'
+      as_system("docker-compose run web rails new . --force --database=postgresql --skip-bundle")
+      chown_if_required
+      as_system('sudo docker-compose build')
+      as_system('mv -f config/database.yml.example config/database.yml')
+      as_system('docker-compose up --build --force-recreate -d ')
+      as_system 'docker-compose run web bin/rails db:create'
+    end
+
+    no_commands do
+
+      def as_system(command)
+        command = OS.linux? ? "sudo #{command}" : command
+        system command
+      end
+
+      def chown_if_required()
+        warning = "It looks like you're running Docker on some flavor of Linux, in which case the files created by your containers are owned by the root user of the container, and not by the user of the host machine. Please change their ownership by supplying your password at the prompt.",
+        action = "system 'sudo chown -R $USER .'"
+        msg = []
+        msg << ""
+        msg << delineator
+        msg << warning
+        msg << ""
+        msg.join("\n\n")
+        puts msg
+        eval(action)
+      end
+
+      def delineator
+        ("-" * 80)
+      end
+
+      def confirm_dependency(options)
+        msg = []
+        msg << ""
+        msg << delineator
+        msg << "It looks like #{options[:warning]}. The following bash command returns false:"
+        msg << "\t$ #{options[:system_query]}"
+        msg << "Please try these instructions:"
+        msg << ("\t" + options[:suggestion])
+        msg << delineator
+        conditional = options[:conditional] ? eval(options[:conditional]) : system(options[:system_query])
+        if conditional == false
+          raise(Roro::Error.new(msg.join("\n\n")))
+        end
+      end
+
+      def confirm_dependencies
+        dependencies = [
+          {
+            system_query: "ls -A",
+            warning: "this is not an empty directory. Roro will not greenfield a new Rails app unless either a) the current directory is empty or b) you run greenfield with the --force flag",
+            suggestion: "$ roro greenfield --force",
+            conditional: "Dir.glob('*').empty?"
+          }, {
+
+            system_query: "which docker",
+            warning: "Docker isn't installed",
+            suggestion: "https://docs.docker.com/install/"
+          }, {
+            system_query: "which docker-compose",
+            warning: "Docker Compose isn't installed",
+            suggestion: "https://docs.docker.com/compose/install/"
+
+          }, {
+            system_query: "docker info",
+            warning: "the Docker daemon isn't running",
+            suggestion: "https://docs.docker.com/config/daemon/#start-the-daemon-manually"
+          }
+        ]
+
+        dependencies.each do |dependency|
+          confirm_dependency(dependency)
+        end
+      end
     end
   end
 end

data/lib/roro/cli/ruby_gem.rb

@@ -30,7 +30,6 @@ module Roro
         template 'ruby_gem/docker/containers/app/Dockerfile.tt', doc_loc, {ruby_version: ruby}
         # append_to_file 'docker-compose.yml', "\n  app-#{ruby}:\n    build:\n\s\s\s\s\s\scontext:"
       end
-      # byebug
 
       # end
 #       <<EOF

data/lib/roro/version.rb

@@ -1,3 +1,3 @@
 module Roro
-  VERSION = "0.1.8"
+  VERSION = "0.2.1"
 end

data/roro.gemspec

@@ -40,10 +40,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency "thor"
   spec.add_dependency "os"
   spec.add_dependency "sshkit"
-  spec.add_dependency "handsome_fencer-crypto", "0.1.4"
+  spec.add_dependency "handsome_fencer-crypto", "0.1.6"
   spec.add_development_dependency "bundler", "~> 1.17"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "byebug"
   spec.add_development_dependency "handsome_fencer-test"
 
 end

data/test_apps/dummy/Gemfile

@@ -37,7 +37,7 @@ gem 'bootsnap', '>= 1.1.0', require: false
 
 group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console
-  gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]
+  # gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]
 end
 
 group :development do

data/test_apps/dummy_roro/Gemfile

@@ -40,7 +40,7 @@ gem 'sshkit'
 
 group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console
-  gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]
+  # gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]
 end
 
 group :development do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roro
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.2.1
 platform: ruby
 authors:
 - schadenfred
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-05 00:00:00.000000000 Z
+date: 2019-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: 0.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: 0.1.6
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -94,20 +94,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: byebug
-  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: handsome_fencer-test
   requirement: !ruby/object:Gem::Requirement
@@ -388,6 +374,66 @@ files:
 - test_apps/dummy_roro/vendor/.keep
 - test_apps/greenfield/.keep
 - vendor/bundle/.keep
+- vendor/cache/actionpack-5.2.2.gem
+- vendor/cache/actionview-5.2.2.gem
+- vendor/cache/activesupport-5.2.2.gem
+- vendor/cache/addressable-2.5.2.gem
+- vendor/cache/builder-3.2.3.gem
+- vendor/cache/coderay-1.1.2.gem
+- vendor/cache/concurrent-ruby-1.1.4.gem
+- vendor/cache/crass-1.0.4.gem
+- vendor/cache/em-websocket-0.5.1.gem
+- vendor/cache/erubi-1.8.0.gem
+- vendor/cache/eventmachine-1.2.7.gem
+- vendor/cache/ffi-1.9.25.gem
+- vendor/cache/formatador-0.2.5.gem
+- vendor/cache/given_core-3.8.0.gem
+- vendor/cache/guard-2.15.0.gem
+- vendor/cache/guard-compat-1.2.1.gem
+- vendor/cache/guard-livereload-2.5.2.gem
+- vendor/cache/guard-minitest-2.4.6.gem
+- vendor/cache/handsome_fencer-crypto-0.1.6.gem
+- vendor/cache/handsome_fencer-test-0.1.1.gem
+- vendor/cache/http_parser.rb-0.6.0.gem
+- vendor/cache/i18n-1.3.0.gem
+- vendor/cache/launchy-2.4.3.gem
+- vendor/cache/listen-3.1.5.gem
+- vendor/cache/loofah-2.2.3.gem
+- vendor/cache/lumberjack-1.0.13.gem
+- vendor/cache/method_source-0.9.2.gem
+- vendor/cache/mini_portile2-2.4.0.gem
+- vendor/cache/minitest-5.11.3.gem
+- vendor/cache/minitest-given-3.8.0.gem
+- vendor/cache/minitest-matchers_vaccine-1.0.4.gem
+- vendor/cache/minitest-rails-3.0.0.gem
+- vendor/cache/multi_json-1.13.1.gem
+- vendor/cache/nenv-0.3.0.gem
+- vendor/cache/net-scp-1.2.1.gem
+- vendor/cache/net-ssh-5.2.0.gem
+- vendor/cache/nokogiri-1.9.1.gem
+- vendor/cache/notiffany-0.1.1.gem
+- vendor/cache/os-1.0.0.gem
+- vendor/cache/pry-0.12.2.gem
+- vendor/cache/public_suffix-3.0.3.gem
+- vendor/cache/rack-2.0.6.gem
+- vendor/cache/rack-livereload-0.3.17.gem
+- vendor/cache/rack-test-1.1.0.gem
+- vendor/cache/rails-dom-testing-2.0.3.gem
+- vendor/cache/rails-html-sanitizer-1.0.4.gem
+- vendor/cache/railties-5.2.2.gem
+- vendor/cache/rake-10.5.0.gem
+- vendor/cache/rb-fsevent-0.10.3.gem
+- vendor/cache/rb-inotify-0.10.0.gem
+- vendor/cache/ruby_dep-1.5.0.gem
+- vendor/cache/shellany-0.0.1.gem
+- vendor/cache/shoulda-3.6.0.gem
+- vendor/cache/shoulda-context-1.2.2.gem
+- vendor/cache/shoulda-matchers-3.1.2.gem
+- vendor/cache/sorcerer-1.0.2.gem
+- vendor/cache/sshkit-1.18.2.gem
+- vendor/cache/thor-0.20.3.gem
+- vendor/cache/thread_safe-0.3.6.gem
+- vendor/cache/tzinfo-1.2.5.gem
 homepage: https://github.com/schadenfred/roro
 licenses:
 - MIT
@@ -409,7 +455,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Containerization framwork for Ruby on Rails applications.