roro 0.3.25 → 0.3.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce80e2557743ac04bef8961392b5c23bf51f1cf99a73a85cda4bb96f08c75a54
-  data.tar.gz: 30fed01b1e4fb71dd11139515d8a85dd59b71381328420237f9a20b933670b68
+  metadata.gz: fca977ddce6ff695738dee841a235d4f1fe753b10d72cf0680b97448a42a2190
+  data.tar.gz: 66cb772f603fed68743466db5203a34ddd87584ef3b5bb6602a7a7663a0d57d6
 SHA512:
-  metadata.gz: a824a157c60ed88f4d5c6e80c4bc663e040fd2a436827a4784f609870dba0ca02ed7d0d00bfa90358c5e543c23681b115cbbdc1702c71e5d0aa0ead982b63ef6
-  data.tar.gz: 7691813e2263ca4007885b6351e7d243681855742cc10a53b122b7474dda489da90184cc792c971fa303f6d3ba9a0b437cfbca088ed10e121165eaea85dbfce9
+  metadata.gz: 25d819fbd99f1acf538abe9c5c981d19b3d08f392449a9da70ab283b5ea332a194517ee64fdddc20b3168e8587997e86731524b75089e7e8c939feb86ab3de0b
+  data.tar.gz: d8acf64e6d89fddf3f67b6c31d217ef887c5a24b509ca5aec57aaf4cd3e96097aa40e302e0eb48e716073e5ede91a89f714dcb59e78adf13a751c221ca862235

data/.circleci/config.yml

@@ -95,10 +95,6 @@ jobs:
       - run: gem install gem-release
       - run: gem bump
       - run: gem release
-      #      - run: bundle config set --local whithout development test
-      #      - run: bundle
-#      - run: rake install
-#      - run: printf "yes" | rake release
 
 workflows:
   matrix-test-rollon:

data/lib/roro/cli/generate/generate.rb

@@ -7,13 +7,13 @@ module Roro
                  aliases: :e,
                  banner: 'one, two, three',
                  desc: 'The environments to generate:',
-                 default: %w[base ci development production]
+                 default: Roro::CLI.roro_environments
 
     method_option :containers,
                  type: :array,
                  aliases: :c,
                  banner: 'container_one, container_two, container_three',
-                 default: %w[backend database frontend],
+                 default: Roro::CLI.roro_default_containers,
                  desc: 'The containers to generate:'
 
     method_option :mise_en_place,
@@ -26,7 +26,7 @@ module Roro
                  type: :array,
                  aliases: :k,
                  banner: 'one.key two.key three.key',
-                 default: %w[base ci development production],
+                 default: Roro::CLI.roro_environments,
                  desc: 'The names of your keys to generate. If none supplied, Roro will infer them from your .env files:'
 
     desc 'generate', 'Generate stuff.'

data/lib/roro/cli/generate/generate_containers.rb

@@ -8,12 +8,14 @@ module Roro
     method_options :containers => :array
     def generate_containers(*containers)
       mise = Roro::CLI.mise
-      containers = options['containers'] || containers.empty? ? %w[frontend backend database] : containers
+      containers = options['containers'] || (containers.empty? ? %w[frontend backend database] : containers)
       # siblings = Dir.glob('./*').select do |f|
       #   File.directory?(f)
       #   !f.match?(mise)
       # end
       # siblings = options[:containers] ? options[:containers] : default_containers
+      create_file("#{mise}/scripts/.keep")
+
       containers.each { |s| s.split('/').last }.each do |container|
         create_file("#{mise}/containers/#{container}/scripts/.keep")
         create_file("#{mise}/containers/#{container}/env/.keep")

data/lib/roro/cli.rb

@@ -37,5 +37,9 @@ module Roro
     def self.roro_environments
       %w[base development production test staging ci]
     end
+
+    def self.roro_default_containers
+      %w[backend database frontend]
+    end
   end
 end

data/lib/roro/stacks/catalog/unstoppable/developer_styles/fatsufodo/stories/django/django.yml

@@ -24,11 +24,12 @@ env:
 
 actions:
   - directory 'stage_one', '.', @env
-  - run "sudo docker-compose run web django-admin startproject \"#{@env[:base][:app_name][:value]}\" . && sudo chown -R $USER:$USER ."
+  - run "sudo docker-compose run web django-admin startproject \"#{@env[:base][:app_name][:value]}\" . &&
+    sudo chown -R $USER:$USER ."
   - |
     run "sudo docker-compose run web django-admin startproject \"#{@env[:base][:app_name][:value]}\" . &&
     sudo chown -R $USER:$USER ."
-  - directory 'stage_two/settings.py', "./#{@env[:base][:app_name][:value]}/", @env
+  - template 'stage_two/settings.py', "./#{@env[:base][:app_name][:value]}/settings.pycd cd", @env
   - |
     run "sudo chown -R $USER:$USER . &&
     sudo docker-compose build &&

data/lib/roro/version.rb

@@ -1,3 +1,3 @@
 module Roro
-  VERSION = "0.3.25"
+  VERSION = "0.3.27"
 end

data/roro.gemspec

@@ -32,8 +32,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'rake', '~> 13.0', '>= 13.0.1'
   spec.add_dependency 'sshkit', '~> 1.21'
   spec.add_dependency 'thor', '~> 1.0', '>= 1.0.1'
-  # spec.add_dependency 'byebug'
-  # spec.add_dependency 'require_all'
   spec.add_development_dependency 'bundler', '~> 2.1', '>= 2.1.4'
   spec.add_development_dependency 'byebug', '~> 11.1', '>= 11.1.3'
   spec.add_development_dependency 'climate_control'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roro
 version: !ruby/object:Gem::Version
-  version: 0.3.25
+  version: 0.3.27
 platform: ruby
 authors:
 - schadenfred
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-22 00:00:00.000000000 Z
+date: 2021-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem-release
@@ -286,7 +286,7 @@ files:
 - lib/roro/stacks/catalog/unstoppable/developer_styles/fatsufodo/stories/django/templates/stage_one/Dockerfile.tt
 - lib/roro/stacks/catalog/unstoppable/developer_styles/fatsufodo/stories/django/templates/stage_one/docker-compose.yml.tt
 - lib/roro/stacks/catalog/unstoppable/developer_styles/fatsufodo/stories/django/templates/stage_one/requirements.txt.tt
-- lib/roro/stacks/catalog/unstoppable/developer_styles/fatsufodo/stories/django/templates/stage_two/settings.py
+- lib/roro/stacks/catalog/unstoppable/developer_styles/fatsufodo/stories/django/templates/stage_two/settings.py.tt
 - lib/roro/stacks/catalog/unstoppable/developer_styles/fatsufodo/stories/django/test/stage_one/dummy/.keep
 - lib/roro/stacks/catalog/unstoppable/developer_styles/fatsufodo/stories/django/test/stage_one/stage_one_test.rb
 - lib/roro/stacks/catalog/unstoppable/developer_styles/fatsufodo/stories/django/test/stage_two/dummy/.keep