roro 0.3.27 → 0.3.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fca977ddce6ff695738dee841a235d4f1fe753b10d72cf0680b97448a42a2190
-  data.tar.gz: 66cb772f603fed68743466db5203a34ddd87584ef3b5bb6602a7a7663a0d57d6
+  metadata.gz: 19be35517b076c033f63af8c5ce2663976a44c0985ae01e2b385a1e3185ace88
+  data.tar.gz: 363daa801e5edbbb26457cd10dd595a136651354e92a013501d480686e4a372a
 SHA512:
-  metadata.gz: 25d819fbd99f1acf538abe9c5c981d19b3d08f392449a9da70ab283b5ea332a194517ee64fdddc20b3168e8587997e86731524b75089e7e8c939feb86ab3de0b
-  data.tar.gz: d8acf64e6d89fddf3f67b6c31d217ef887c5a24b509ca5aec57aaf4cd3e96097aa40e302e0eb48e716073e5ede91a89f714dcb59e78adf13a751c221ca862235
+  metadata.gz: 0a7d48d17152790425c6eb85a18373dca236adb2b9535f41ac32fbb152eb1bcccf6be260bd343a0c52fc8914edf40044bb2e49f5fbd3a7c358a7df8960faf2d5
+  data.tar.gz: 3d34abd1258190792277d4e0a3fb8ddef2cf33aecc48d46d766a8aae411713ce232ee666ffef8b2c834cf73b4400f884530503aa6ed69f992d2fd9964623038f

data/lib/roro/cli.rb

@@ -38,6 +38,10 @@ module Roro
       %w[base development production test staging ci]
     end
 
+    def self.stack_documentation_root
+      '<a href="url">link text</a>'
+    end
+
     def self.roro_default_containers
       %w[backend database frontend]
     end

data/lib/roro/configurators/adventure_picker.rb

@@ -10,6 +10,8 @@ module Roro
       no_commands do
         def choose_adventure(stack)
           build_inflection(stack)
+          say("Rolling story on from stack: #{@stack}\n\n")
+          say(@getsome)
           choice = ask(@inflection)
           story_name = story_from(choice.to_s)
           "#{stack}/#{story_name}"
@@ -20,7 +22,8 @@ module Roro
           prompt = inflection_prompt
           options = inflection_options
           prompt_options = humanize(options)
-          @inflection = ["#{prompt} #{prompt_options}", limited_to: options.keys]
+          @getsome = "#{prompt}\n"
+          @inflection = ["#{prompt_options}\n\n", "Choices: [#{set_color(options.keys.map { |k| k.to_i }.join(' '), :blue)}]"]
         end
 
         def inflection_prompt
@@ -45,9 +48,9 @@ module Roro
           array = []
           hash.map do |key, value|
             preface = get_story_preface("#{@stack}/#{value}")
-            array << "\n(#{key}) #{value}:\n #{preface}"
+            array << "#{set_color("(#{key})", :bold)} #{set_color(value, :blue, :bold)}\n\s\s\s\s#{preface}"
           end
-          array.join
+          array.join("\n\n")
         end
 
         def get_story_preface(story)

data/lib/roro/configurators/configurator.rb

@@ -50,8 +50,8 @@ module Roro
 
       def override_environment_variables
         @env.each do |e, v| v.each do |k, v|
-            answer = @asker.confirm_default(@builder.override(e, k, v))
-            v[:value] = answer unless answer.eql?('y')
+            answer = @asker.confirm_default(@builder.override(e, k, v), v)
+            answer.eql?('') ? return : v[:value] = answer
           end
         end
       end

data/lib/roro/configurators/question_asker.rb

@@ -13,15 +13,21 @@ module Roro
           answer.size > 1 ? answer : override_default(question)
         end
 
-        def confirm_default(question)
-          options = { "y": "yes", "n": "no"}
+        def confirm_default(question, default)
+          options = { "y": "yes", "n": "no", 'a': 'accept all defaults'}
           humanized_options = options.map {|key, value|
             "(#{key}) #{value}"
           }
           getsome = "Would you like to accept the default value?\n"
           prompt = [question, getsome, humanized_options, "\n"].join("\n")
-          answer = ask(prompt, limited_to: options.keys.map(&:to_s))
-          answer.eql?('n') ? override_default(question) : 'y'
+          case ask(prompt)
+          when 'y'
+            default
+          when 'n'
+            override_default(question)
+          when 'a'
+            ''
+          end
         end
       end
     end

data/lib/roro/stacks/catalog/unstoppable/developer_styles/okonomi/stories/roll_your_own/test/stage_one/stage_one_test.rb

@@ -7,7 +7,7 @@ describe 'okonomi roll_your_own' do
 
   Given(:rollon)    {
     stub_adventure
-    stub_overrides
+    # stub_overrides
     stub_run_actions
     cli.rollon
   }
@@ -19,15 +19,20 @@ describe 'okonomi roll_your_own' do
     # quiet { rollon }
   }
 
+  describe 'testing cli ask and say' do
+    Given(:adventures) { %w[] }
+
+    Then { }
+  end
   describe 'must generate' do
     describe 'templates with stage one' do
-      # Then  { assert_file 'mise/stacks/my_story/templates/stage_one/.keep' }
+      Then  { assert_file 'mise/stacks/my_story/templates/stage_one/.keep' }
     end
 
     describe 'test' do
       describe 'with stage one' do
         describe 'with stage dummy' do
-          # Then  { assert_file 'mise/stacks/my_story/test/stage_one/stage_dummy/.keep' }
+          Then  { assert_file 'mise/stacks/my_story/test/stage_one/stage_dummy/.keep' }
         end
       end
     end

data/lib/roro/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roro
 version: !ruby/object:Gem::Version
-  version: 0.3.27
+  version: 0.3.28
 platform: ruby
 authors:
 - schadenfred
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-23 00:00:00.000000000 Z
+date: 2021-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem-release
@@ -358,7 +358,7 @@ files:
 - lib/roro/stacks/catalog/unstoppable/developer_styles/omakase/stories/wordpress/test/stage_one/stage_dummy/.keep
 - lib/roro/stacks/catalog/unstoppable/developer_styles/omakase/stories/wordpress/test/stage_one/stage_test.rb
 - lib/roro/stacks/catalog/unstoppable/developer_styles/omakase/stories/wordpress/wordpress.yml
-- lib/roro/stacks/catalog/unstoppable/developer_styles/sashimi/fatsufodo.yml
+- lib/roro/stacks/catalog/unstoppable/developer_styles/sashimi/sashimi.yml
 - lib/roro/stacks/catalog/unstoppable/developer_styles/sashimi/stories/django/django.yml
 - lib/roro/stacks/catalog/unstoppable/developer_styles/sashimi/stories/django/templates/stage_one/Dockerfile.tt
 - lib/roro/stacks/catalog/unstoppable/developer_styles/sashimi/stories/django/templates/stage_one/docker-compose.yml.tt