mobilis 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a79181b97bf2572ac73e8dce659320884665aa649e955970d95bda0251c295dc
-  data.tar.gz: 303979cb4e400a188c6ca99d75f8c8857b4926661287e485b0999f0341f30611
+  metadata.gz: b6f70c5988047af743d26f24694bdbf9894f7a6b5d05666987617aaf55fccd93
+  data.tar.gz: 185119c7a513b48f0d8ff991f2d79c40b43890b0fcf016624f786f8ba1383b45
 SHA512:
-  metadata.gz: 561a375e73c458745e72415ab88ee6e19d7fe7b299a576ee2a619bc5e66e45ff4f25d763f8a58a2d8465661c6f861b6e5e1642c2e3f2da7084c57a5c5dbe2b2a
-  data.tar.gz: 02aabfdd670aeb2d7138b3507d36f15e4c2009656430ac9ec73c6829627f0e87f52949e8b9ce0d911786c24ed685e2ee1396a97a4cb98bb60fc829e2a0f26940
+  metadata.gz: 6678e0445f6a8d777bc6f6c5280b7abacac3b61cb9b545cd51fc4a5ada43696a4815a2fa1fff553e8b3a2646b36550b12ec157437a78027225de87e63a20b650
+  data.tar.gz: ac072bd7e4bebca33480d3817aba9920869033d142d562f4908c6ca0c1a1a592f005ef834ffab4a025ea2b99e24741f534869e6daac49d2c3c461040bfc59c01

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 ## [Unreleased]
 
+## [0.0.5] - 2022-12-09
+- fixed a bug when loading a project that made the rails builder not update
+- fixed permissions of wait-until, which means rails projects will wait until the database
+  is available to run migrations and start the server
+- reworked a lot of the screens to be less cluttered and make more sense
+- fixed unit tests to not hardcode my username in the test
+- bumped redis version
+
 ## [0.0.4] - 2022-09-11
 
 - Added command line options load and build

data/lib/mobilis/docker_compose_projector.rb

@@ -99,7 +99,7 @@ def redis_service service
   attributes = @project.attributes
   port_key = "#{service.name}_internal_port_no".to_sym
   {
-    "image" => "redis:6.2-alpine",
+    "image" => "redis:7.0.5-alpine",
     "restart" => "always",
     "command" => "redis-server --save 20 1 --loglevel warning --requirepass #{ service.password }",
     "environment" => [

data/lib/mobilis/interactive_designer.rb

@@ -26,28 +26,37 @@ state_machine :state, initial: :intialize do
   end
 
   event :go_add_omakase_stack_rails_project do
-    transition [:main_menu] => :add_omakase_stack_rails_project
+    transition [:add_project_menu] => :add_omakase_stack_rails_project
   end
 
   event :go_add_prime_stack_rails_project do
-    transition [:main_menu] => :add_prime_stack_rails_project
+    transition [:add_project_menu] => :add_prime_stack_rails_project
   end
 
   event :go_add_postgresql_instance do
-    transition [:main_menu] => :add_postgresql_instance
+    transition [:add_project_menu] => :add_postgresql_instance
+  end
+
+  event :go_add_project_menu do
+    transition [:main_menu] => :add_project_menu
+  end
+
+  event :go_edit_project_menu do
+    transition [:main_menu] => :edit_project_menu
   end
 
   event :go_add_mysql_instance do
-    transition [:main_menu] => :add_mysql_instance
+    transition [:add_project_menu] => :add_mysql_instance
   end
 
   event :go_add_redis_instance do
-    transition [:main_menu] => :add_redis_instance
+    transition [:add_project_menu] => :add_redis_instance
   end
 
   event :go_back do
-    transition [:edit_rails_project] => :main_menu
+    transition [:edit_rails_project] => :edit_project_menu
     transition [:edit_generic_project] => :main_menu
+    transition [:add_project_menu] => :main_menu
   end
 
   event :go_add_rack_project do
@@ -56,12 +65,7 @@ state_machine :state, initial: :intialize do
 
   event :go_edit_rails_project do
     transition [
-      :add_omakase_stack_rails_project,
-      :add_prime_stack_rails_project,
-      :edit_rails_controller,
-      :edit_rails_model,
-      :toggle_rails_api_mode,
-      :main_menu
+      :edit_project_menu, :add_omakase_stack_rails_project, :add_prime_stack_rails_project
     ] => :edit_rails_project
   end
 
@@ -99,6 +103,7 @@ state_machine :state, initial: :intialize do
 
   event :go_edit_links_select_project do
     transition [:main_menu] => :edit_links_select_project
+    transition [:edit_links] => :edit_links_select_project
   end
 
   event :go_edit_links do
@@ -119,10 +124,55 @@ state_machine :state, initial: :intialize do
       puts
     end
     def choices
-      project_choices = projects.map do |project|
-        { name: "Edit '#{ project.name }' project", value: -> { @selected_rails_project = project ; go_edit_rails_project } }
+      menu_items = [
+        { name: "reload all code",           value: -> { reload! }},
+        { name: "[m] Add project",           value: -> { go_add_project_menu }},
+        { name: "[m] Edit existing project", value: -> { go_edit_project_menu }}
+      ]
+      if projects.length > 1
+        menu_items.concat([
+          { name: "[m] edit links",                value: -> { go_edit_links_select_project }}
+        ])
       end
+      if projects.length > 0
+        menu_items.concat([
+          { name: "Save mproj.json",           value: -> { go_save_project }},
+          { name: "Generate",                  value: -> { go_generate }},
+          { name: "Build",                     value: -> { go_build }}
+        ])
+      end
+      menu_items
+    end
+    def action = false
+  end
+
+  state :edit_project_menu do
+    def display
+      puts
+      tp.set :max_width, 160
+      tp projects, 'name', 'type', 'options': lambda {|p| p.options.join ", "}
+      puts
+    end
+    def choices
+      [
+        {name: "return to Main Menu",          value: -> { go_main_menu }},
+        *(projects.map { |project| { name: "Edit '#{ project.name }' project", value: -> { @selected_rails_project = project ; go_edit_rails_project } } })
+      ]
+    end
+    def action = false
+  end
+
+  state :add_project_menu do
+    def display
+      puts
+      tp.set :max_width, 160
+      tp projects, 'name', 'type', 'options': lambda {|p| p.options.join ", "}
+      puts
+    end
+
+    def choices
       [
+        {name: "return to Main Menu",          value: -> { go_main_menu }},
         {name: "Add prime stack rails project",    value: -> { go_add_prime_stack_rails_project }},
         {name: "Add omakase stack rails project",  value: -> { go_add_omakase_stack_rails_project }},
         {name: "Add rack3 project",                value: -> { go_add_rack_project }},
@@ -138,12 +188,7 @@ state_machine :state, initial: :intialize do
         #{ name: "Add couchdb instance",            value: -> { go_add_couchdb_instance }},
         #{ name: "Add kafka instance",              value: -> { go_add_kafka_instance }},
         #{ name: "Add graphql instance",            value: -> { go_add_grapql_instance }},
-        #{ name: "Add gitlab instance w/workers",   value: -> { go_add_gitlab_instance }},
-        *project_choices,
-        { name: "edit links", value: -> { go_edit_links_select_project }},
-        { name: "Save mproj.json", value: -> { go_save_project }},
-        { name: "Generate", value: -> { go_generate }},
-        { name: "Build", value: -> { go_build }}
+        #{ name: "Add gitlab instance w/workers",   value: -> { go_add_gitlab_instance }}
       ]
     end
     def action = false
@@ -179,7 +224,7 @@ state_machine :state, initial: :intialize do
         end
       end
       @selected_project.set_links selected
-      go_main_menu
+      go_edit_links_select_project
     end
   end
 
@@ -217,7 +262,8 @@ state_machine :state, initial: :intialize do
 
   state :add_prime_stack_rails_project do
     def display
-      spacer
+      puts "Creates a new rails project, using the prime stack"
+      puts "includes rspec haml factory_bot"
     end
     def choices = false
     def action
@@ -229,7 +275,7 @@ state_machine :state, initial: :intialize do
 
   state :add_rack_project do
     def display
-      spacer
+      puts "Creates a new rack project, with a minimal script"
     end
     def choices = false
     def action
@@ -392,5 +438,19 @@ def blank_space
   puts ""
 end
 
+def reload!(print = true)
+  puts 'Reloading ...' if print
+  # Main project directory.
+  root_dir = File.expand_path('../..', __dir__)
+  # Directories within the project that should be reloaded.
+  reload_dirs = %w{lib}
+  # Loop through and reload every file in all relevant project directories.
+  reload_dirs.each do |dir|
+    Dir.glob("#{root_dir}/#{dir}/**/*.rb").each { |f| load(f) }
+  end
+  # Return true when complete.
+  true
+end
+
 end
 end

data/lib/mobilis/project.rb

@@ -99,17 +99,15 @@ source "https://rubygems.org"
 # FIXME
 #git_source(:github) { |repo| "https://github.com/repo.git" }
 
-ruby "3.1.2"
-
-gem "rails", "~> 7.0.3", ">= 7.0.3.1"
-gem "sqlite3", "~> 1.4"
-gem "puma", "~> 5.0"
+gem "rails"
+gem "sqlite3"
+gem "puma"
 gem "jbuilder"
-gem "redis", "~> 4.0"
+gem "redis"
 gem "kredis"
-gem "bcrypt", "~> 3.1.7"
+gem "bcrypt"
 gem "bootsnap", require: false
-gem "image_processing", "~> 1.2"
+gem "image_processing"
 gem "rack-cors"
 gem "pg"
 gem "mysql2"
@@ -130,7 +128,7 @@ end
 
 def has_rails_project?
   projects.each do |p|
-    return true if p.type == :rails
+    return true if p.type.to_sym == :rails
   end
   return false
 end

data/lib/mobilis/rails_project.rb

@@ -126,7 +126,7 @@ def generate_Dockerfile
 FROM ruby:latest
 RUN apt-get update -qq && apt-get install -y nodejs postgresql-client default-mysql-client dos2unix
 WORKDIR /myapp
-COPY wait-until /myapp/wait-until
+COPY --chmod=0755 wait-until /myapp/wait-until
 COPY Gemfile /myapp/Gemfile
 COPY Gemfile.lock /myapp/Gemfile.lock
 RUN bundle install

data/lib/mobilis/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Mobilis
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/mobilis.gemspec

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+require_relative "lib/mobilis/version"
+
+Gem::Specification.new do |spec|
+  spec.name = "mobilis"
+  spec.version = Mobilis::VERSION
+  spec.authors = ["Meleneth"]
+  spec.email = ["meleneth@gmail.com"]
+
+  spec.summary = "Generate and scaffold multiple projects and a docker compose file"
+  spec.homepage = "https://github.com/meleneth/mobilis"
+  spec.required_ruby_version = ">= 2.6.0"
+  spec.licenses    = ['MIT']
+  #spec.metadata["allowed_push_host"] = "TODO: Set to your gem server 'https://example.com'"
+
+  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["source_code_uri"] = "https://github.com/meleneth/mobilis"
+  spec.metadata["changelog_uri"] = "https://github.com/meleneth/mobilis/CHANGELOG.md"
+
+  # Specify which files should be added to the gem when it is released.
+  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
+  spec.files = Dir.chdir(__dir__) do
+    `git ls-files -z`.split("\x0").reject do |f|
+      (f == __FILE__) || f.match(%r{\A(?:(?:bin|test|spec|features)/|\.(?:git|travis|circleci)|appveyor)})
+    end
+  end
+  spec.bindir = "exe"
+  spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+  spec.executables << 'mobilis'
+
+  # Uncomment to register a new dependency of your gem
+  spec.add_dependency "awesome_print"
+  spec.add_dependency "optimist"
+  spec.add_dependency "pry"
+  spec.add_dependency "state_machine"
+  spec.add_dependency "table_print"
+  spec.add_dependency "tty-prompt"
+
+  spec.add_development_dependency "super_diff"
+
+  # spec.add_dependency "example-gem", "~> 1.0"
+
+  # For more information and examples about making a new gem, check out our
+  # guide at: https://bundler.io/guides/creating_gem.html
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mobilis
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Meleneth
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-12 00:00:00.000000000 Z
+date: 2022-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -141,6 +141,7 @@ files:
 - lib/mobilis/rails_project.rb
 - lib/mobilis/redis_instance.rb
 - lib/mobilis/version.rb
+- mobilis.gemspec
 - sig/mobilis.rbs
 homepage: https://github.com/meleneth/mobilis
 licenses: