roro 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8785a69852a94916710e3a3e11735e850ca39549
-  data.tar.gz: b26a42ce7df419812da00458b851b3e7877b3ccd
+SHA256:
+  metadata.gz: e3d068251958b75df2f13517e4b317da0a97d1b5f42e6e5fc1f15b9baae4c041
+  data.tar.gz: 060b40161e644e79c332912f8cb1bbda35833814177c42edd2052ed4224cf181
 SHA512:
-  metadata.gz: 545508ba70759f7d51e93c17f22e7c85b6c05353051afa3c2d7bbef3856606853c6b25247fbfbdfcbaac2cb1a2e60163a4b989dcefa12bfad4702b198a50a968
-  data.tar.gz: 3b323886a568f6ae9e18ea7e8ad8f556584d73223600b8ed2ce05dbcd73bb3d66e9c5d9fe80ef440688756fa68e9b1802843fa59d6567f79bcee93239d1616f8
+  metadata.gz: f8f383bbf9a5358045323d200ce96c6b3d04045f7534c8fa33352d98d729ded80150b38fed00eb8a5404a4154d6fa872559ab790d48c784b3bb09380085b0e0c
+  data.tar.gz: 70e9dd8395b2b5c11ce0bfb34f4a55cacca1815e762ebbd8c22e7218fb5fed1dbd196a2c001260098028e22d1cbf4b6a0111a5a8513e9428357c6c5b509d7b60

data/.circleci/config.yml

@@ -4,22 +4,35 @@ defaults: &defaults
 version: 2
 
 jobs:
+
   build:
+    machine: true
+    steps:
+      - checkout
+
+  test:
     docker:
        - image: circleci/ruby:2.5.3
     steps:
       - checkout
+      - setup_remote_docker
+      - run: gem install bundler
+      - run: bundle
+      - run: rake install
+      - run: mkdir tmp
+      - run: docker-compose up app
 
-  test:
+  test_all:
     docker:
        - image: circleci/ruby:2.5.3
     steps:
       - checkout
+      - setup_remote_docker
       - run: gem install bundler
       - run: bundle
       - run: rake install
       - run: mkdir tmp
-      - run: rake test
+      - run: docker-compose up
 
   build-greenfield:
     machine: true
@@ -56,10 +69,12 @@ jobs:
             curl -Is localhost:3000 | head -n 1
 
   release:
-    machine: true
+    docker:
+      - image: circleci/ruby:2.5.3
     steps:
       - checkout
-      - run: printenv
+      - setup_remote_docker
+      - run: gem install bundler
       - run: bundle
       - run: rake install
       - run: roro expose
@@ -77,21 +92,29 @@ workflows:
       - test:
           filters:
             branches:
-              ignore:
-                - /build-.*/
-                - release
+              only:
+                - /feature-.*/
       - build-greenfield:
           filters:
             branches:
               only:
                 - build-greenfield
+                - development
                 - master
       - build-rollon:
           filters:
             branches:
               only:
                 - build-rollon
+                - development
                 - master
+      - test_all:
+          filters:
+            branches:
+              only:
+                - development
+                - master
+
       - release:
           filters:
             branches:

data/.gitignore

@@ -5,10 +5,10 @@
 /doc/
 /pkg/
 /spec/reports/
-tmp/
+tmp/**/*
 !tmp/.keep
 greenfield/**/*
 .byebug_history
 
 docker/**/*.env
-docker/**/*.key
+docker/**/*.key

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    roro (0.1.1)
+    roro (0.1.3)
       handsome_fencer-crypto (= 0.1.4)
+      os
       sshkit
       thor
 
@@ -110,6 +111,7 @@ GEM
     notiffany (0.1.1)
       nenv (~> 0.1)
       shellany (~> 0.0)
+    os (1.0.0)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)

data/Guardfile

@@ -14,17 +14,23 @@
 #  $ ln -s config/Guardfile .
 #
 # and, you'll have to watch "config/Guardfile" instead of "Guardfile"
+options = {
+  cli: '',
+  all_after_run: false
+}
 
-
-guard :minitest, cli: '' do
+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/(.*/)?([^/]+)\.rb$})     { 'test' }
+
+  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" }

data/docker-compose.yml

@@ -0,0 +1,21 @@
+version: '3.1'
+
+services:
+
+  app:
+    build:
+      context: .
+      dockerfile: docker/containers/app/Dockerfile
+    command: rake test
+
+  app-2-5-3:
+    build:
+      context: .
+      dockerfile: docker/containers/2_5_3/Dockerfile
+    command: rake test
+
+  app-2-6-0:
+    build:
+      context: .
+      dockerfile: docker/containers/2_6_0/Dockerfile
+    command: rake test

data/docker/containers/2_5_3/Dockerfile

@@ -0,0 +1,10 @@
+FROM ruby:2.5.3-alpine
+
+RUN apk add --no-cache --update build-base linux-headers \
+    postgresql-dev nodejs tzdata libxml2-dev libxslt-dev git
+
+WORKDIR /usr/src/app
+COPY . /usr/src/app/
+RUN rake install
+RUN gem install bundler
+RUN bundle

data/docker/containers/2_6_0/Dockerfile

@@ -0,0 +1,10 @@
+FROM ruby:2.6.0-alpine
+
+RUN apk add --no-cache --update build-base linux-headers \
+    postgresql-dev nodejs tzdata libxml2-dev libxslt-dev git
+
+WORKDIR /usr/src/app
+COPY . /usr/src/app/
+RUN rake install
+RUN gem install bundler
+RUN bundle

data/docker/containers/app/Dockerfile

@@ -0,0 +1,10 @@
+FROM ruby:2.5-alpine
+
+RUN apk add --no-cache --update build-base linux-headers \
+    postgresql-dev nodejs tzdata libxml2-dev libxslt-dev git
+
+WORKDIR /usr/src/app
+COPY . /usr/src/app/
+RUN rake install
+RUN gem install bundler
+RUN bundle

data/docker/env_files/circleci.env.enc

@@ -1,2 +1,4 @@
-WDN8iYm/r+dQDS2TvKXWU/HfVzSo2vkufmfRWIr3DadCGmvQxLz2GhBN1/JJ
-QgjtMoLsgeL26jYt9Z9icx60+g==
+0ZAQKGGYUfmlZ5t3HKC9qjQ6lUQnbFrN/nGjUAcBGsZC0140WIT3rvUkvqvM
+3kb6BPlRsiiilSoDwJuPapAoZOqUWW4kyVE7nncPHKnzqTmGbXYStf4e9TBt
+KmUBVU/5LLmQnD6nI9BJMKDg4J+PPPUNjPyJK+XnQWmNWWVQQAWigoYvudVL
+V1lj0fSel5pV

data/lib/roro/cli.rb

@@ -5,6 +5,7 @@ require 'roro/cli/greenfield'
 require 'roro/cli/generate_keys'
 require 'roro/cli/obfuscate'
 require 'roro/cli/expose'
+require 'roro/cli/ruby_gem'
 
 module Roro
   class CLI < Thor
@@ -14,5 +15,7 @@ module Roro
     def self.source_root
       File.dirname(__FILE__) + '/cli/templates'
     end
+
+
   end
 end

data/lib/roro/cli/base.rb

@@ -96,6 +96,14 @@ module Roro
         copy_file 'greenfield/Dockerfile', 'Dockerfile'
         copy_file 'greenfield/config/database.yml.example', 'config/database.yml.example'
       end
+
+      def copy_ruby_gem_files
+        copy_file 'ruby_gem/config.yml', '.circleci/config.yml'
+        # copy_file 'greenfield/Gemfile.lock', 'Gemfile.lock'
+        # copy_file 'greenfield/docker-compose.yml', 'docker-compose.yml'
+        # copy_file 'greenfield/Dockerfile', 'Dockerfile'
+        # copy_file 'greenfield/config/database.yml.example', 'config/database.yml.example'
+      end
     end
 
     private

data/lib/roro/cli/greenfield.rb

@@ -1,3 +1,4 @@
+require 'os'
 module Roro
 
   class CLI < Thor
@@ -11,26 +12,16 @@ module Roro
     method_option :force, desc: "force over-write of existing files"
 
     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
       copy_greenfield_files
-      system 'sleep 5s'
-      system 'sudo chown -R $USER:$USER .'
-      system 'sleep 5s'
       system 'sudo docker-compose run web rails new . --force --database=postgresql --skip-bundle'
-      system 'sleep 5s'
-      system 'sudo chown -R $USER:$USER .'
-      system 'sleep 5s'
+      system 'sudo chown -R $USER .' if OS.linux?
       system 'sudo docker-compose build'
-      system 'sleep 5s'
       system 'mv -f config/database.yml.example config/database.yml'
-      system 'sleep 5s'
-      system 'chmod 1777 /tmp'
-      system 'sudo docker-compose up -d'
-      system 'sleep 5s'
-      system 'sudo chown -R $USER:$USER .'
-      system 'sleep 5s'
+      system 'sudo docker-compose up --build --force-recreate -d '
       system 'sudo docker-compose run web bin/rails db:create'
     end
   end

data/lib/roro/cli/ruby_gem.rb

@@ -0,0 +1,49 @@
+module Roro
+
+  class CLI < Thor
+
+    include Thor::Actions
+
+    desc "ruby_gem", "Generate files for containerized gem testing, CircleCI, and releasing to RubyGems."
+    method_option :rubies, type: :array, banner: "2.5.3 2.4.2"
+
+    def ruby_gem
+      rubies = options["rubies"] || ["2.5.3", "2.6.0"]
+      copy_file 'ruby_gem/docker-compose.yml', 'docker-compose.yml'
+      copy_file 'ruby_gem/config.yml', '.circleci/config.yml'
+      copy_file 'ruby_gem/setup-gem-credentials.sh', '.circleci/setup-gem-credentials.sh'
+      directory 'ruby_gem/docker', 'docker', { ruby_version: "2.5"}
+
+      rubies.each do |ruby|
+        rubydash = ruby.gsub('.', '-')
+        rubyunderscore = ruby.gsub('.', '_')
+        doc_loc = "docker/containers/#{rubyunderscore}/Dockerfile"
+        content = <<-EOM
+
+  app-#{rubydash}:
+    build:
+      context: .
+      dockerfile: #{doc_loc}
+    command: rake test
+        EOM
+        append_to_file 'docker-compose.yml', content
+        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
+#    This is the first way of creating
+#    here document ie. multiple line string.
+# EOF
+      # %w[app web].each do |container|
+      #   options = {
+      #     email: @env_hash['DOCKERHUB_EMAIL'],
+      #     app_name: @env_hash['APP_NAME'] }
+      #
+      #   template("docker/containers/#{container}/Dockerfile.tt", "docker/containers/#{container}/Dockerfile", options)
+      # end
+    end
+  end
+end

data/lib/roro/cli/templates/ruby_gem/config.yml

@@ -0,0 +1,122 @@
+defaults: &defaults
+  working_directory: /repo
+
+version: 2
+
+jobs:
+
+  build:
+    machine: true
+    steps:
+      - checkout
+
+  test:
+    docker:
+       - image: circleci/ruby:2.5.3
+    steps:
+      - checkout
+      - setup_remote_docker
+      - run: gem install bundler
+      - run: bundle
+      - run: rake install
+      - run: mkdir tmp
+      - run: docker-compose up app
+
+  test_all:
+    docker:
+       - image: circleci/ruby:2.5.3
+    steps:
+      - checkout
+      - setup_remote_docker
+      - run: gem install bundler
+      - run: bundle
+      - run: rake install
+      - run: mkdir tmp
+      - run: docker-compose up
+
+  build-greenfield:
+    machine: true
+    steps:
+      - checkout
+      - run: bundle
+      - run: rake install
+      - run:
+          name: Greenfield
+          working_directory: sooperdooper
+          command: |
+            bundle
+            sleep 2s
+            rake install
+            sleep 5s
+            roro greenfield
+            sleep 5s
+            curl -Is localhost:3000 | head -n 1
+
+  build-rollon:
+    machine: true
+    steps:
+      - checkout
+      - run: bundle
+      - run: rake install
+      - run:
+          name: Rollon
+          working_directory: test_apps/dummy
+          command: |
+            roro rollon
+            docker-compose up -d
+            docker-compose exec app bin/rails db:create
+            docker-compose exec app rake test
+            curl -Is localhost:3000 | head -n 1
+
+  release:
+    docker:
+      - image: circleci/ruby:2.5.3
+    steps:
+      - checkout
+      - setup_remote_docker
+      - run: gem install bundler
+      - run: bundle
+      - run: rake install
+      - run: roro expose
+      - run: echo 'source docker/env_files/circleci.env' >> $BASH_ENV
+      - run: bash .circleci/setup-gem-credentials.sh
+      - run: rake release
+
+
+workflows:
+  version: 2
+  build-and-deploy:
+    jobs:
+      - build
+      - test:
+          filters:
+            branches:
+              except:
+                - build-greenfield
+                - build-rollon
+                - release
+                - master
+      - build-greenfield:
+          filters:
+            branches:
+              only:
+                - build-greenfield
+                - master
+      - build-rollon:
+          filters:
+            branches:
+              only:
+                - build-rollon
+                - master
+      - test_all:
+          filters:
+            branches:
+              only:
+                - development
+                - master
+
+      - release:
+          filters:
+            branches:
+              only:
+                - release

data/lib/roro/cli/templates/ruby_gem/docker-compose.yml

@@ -0,0 +1,9 @@
+version: '3.1'
+
+services:
+
+  app:
+    build:
+      context: .
+      dockerfile: docker/containers/app/Dockerfile
+    command: rake test

data/lib/roro/cli/templates/ruby_gem/docker/containers/app/Dockerfile.tt

@@ -0,0 +1,10 @@
+FROM ruby:<%= config[:ruby_version] %>-alpine
+
+RUN apk add --no-cache --update build-base linux-headers \
+    postgresql-dev nodejs tzdata libxml2-dev libxslt-dev git
+
+WORKDIR /usr/src/app
+COPY . /usr/src/app/
+RUN rake install
+RUN gem install bundler
+RUN bundle

data/lib/roro/cli/templates/ruby_gem/setup-gem-credentials.sh

@@ -0,0 +1,3 @@
+mkdir ~/.gem
+echo -e "---\r\n:rubygems_api_key: $RUBYGEMS_API_KEY" > ~/.gem/credentials
+chmod 0600 /home/circleci/.gem/credentials

data/lib/roro/version.rb

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

data/roro.gemspec

@@ -38,6 +38,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "thor"
+  spec.add_dependency "os"
   spec.add_dependency "sshkit"
   spec.add_dependency "handsome_fencer-crypto", "0.1.4"
   spec.add_development_dependency "bundler", "~> 1.17"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roro
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - schadenfred
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-02 00:00:00.000000000 Z
+date: 2019-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: os
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sshkit
   requirement: !ruby/object:Gem::Requirement
@@ -136,6 +150,10 @@ files:
 - bin/console
 - bin/roro
 - bin/setup
+- docker-compose.yml
+- docker/containers/2_5_3/Dockerfile
+- docker/containers/2_6_0/Dockerfile
+- docker/containers/app/Dockerfile
 - docker/env_files/.keep
 - docker/env_files/circleci.env.enc
 - docker/keys/.keep
@@ -148,6 +166,7 @@ files:
 - lib/roro/cli/greenfield.rb
 - lib/roro/cli/obfuscate.rb
 - lib/roro/cli/rollon.rb
+- lib/roro/cli/ruby_gem.rb
 - lib/roro/cli/templates/Gemfile.lock
 - lib/roro/cli/templates/Guardfile
 - lib/roro/cli/templates/circleci/Rakefile
@@ -175,6 +194,12 @@ files:
 - lib/roro/cli/templates/greenfield/config/database.yml.example
 - lib/roro/cli/templates/greenfield/docker-compose.yml
 - lib/roro/cli/templates/lib/tasks/deploy.rake
+- lib/roro/cli/templates/ruby_gem/config.yml
+- lib/roro/cli/templates/ruby_gem/docker-compose.yml
+- lib/roro/cli/templates/ruby_gem/docker/containers/app/Dockerfile.tt
+- lib/roro/cli/templates/ruby_gem/docker/env_files/.keep
+- lib/roro/cli/templates/ruby_gem/docker/keys/.keep
+- lib/roro/cli/templates/ruby_gem/setup-gem-credentials.sh
 - lib/roro/version.rb
 - lib/tasks/deploy.rake
 - roro.gemspec
@@ -255,6 +280,7 @@ files:
 - test_apps/dummy/test/test_helper.rb
 - test_apps/dummy/tmp/.keep
 - test_apps/dummy/vendor/.keep
+- test_apps/dummy_gem/.keep
 - test_apps/dummy_roro/.circleci/Rakefile
 - test_apps/dummy_roro/.circleci/config.job-example.yml
 - test_apps/dummy_roro/.circleci/config.yml
@@ -384,8 +410,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Dockerize your Rails app, set it up for CI, roll it onto your image repository,