souls 0.23.0 → 0.23.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '099412f555b33244d7d6aa52ba4f3bc56d80e3a141166306f0934dfea16c4663'
-  data.tar.gz: cd338c18fa055b6456144a02272ec716cacdb21cd2dd94ca11289a3964dcfe53
+  metadata.gz: aa814dc13fd13435747be4c7f825b20f695493e58f2973dd92ec8116e3d6a918
+  data.tar.gz: 8aa79f05984d5994837aa98d9bb3d54da16e42c1ba20c39291f558b9dcba30a8
 SHA512:
-  metadata.gz: de83001db9604bfaf3a8c1c7ed802e477bb1330bbc6991dae6e97966f3e52d672cd7c80b5e63551c789c033a62ba29dc203a084a75b8b7f21c0f7bd29feae250
-  data.tar.gz: 956c60cb281e4374ccd9d3d720adccf765404f9f617fe5c41324e6b4590a3133d6949af61bcc58a996e4a9793caf81cb2707c2dc819725b58f2a31b435f017d6
+  metadata.gz: 4472db8c5bbe47770b5da27a6e5b3feabdfea348161f580dc3235d9e6439320de550926bd4b40f4a57542f446c6b3f9aa720b9428ace9b565b46e95df043e6ae
+  data.tar.gz: f21acca565e37aa4f5cdbf06709d73157127f1158056260d1170fb10d03f2d4a1305a000fbbd53fedf5e8d551e1bcaf1e26fb708e9ad37912b80f2863de232f2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    souls (0.22.9)
+    souls (0.23.4)
       paint (= 2.2.1)
       whirly (= 0.3.0)
 

data/exe/souls

@@ -1,15 +1,17 @@
 #!/usr/bin/env ruby
 require "souls"
 begin
-  require "./config/souls" unless ARGV[0] == "new" || ARGV[0] == "i" || ARGV[0] == "-v"
+  require "./config/souls" unless ARGV[0] == "new" || ARGV[0] == "i" || ARGV[0] == "-v" || ARGV[0] == "deploy"
 rescue
   puts "Make sure you are at SOULs APP directory!"
 end
 begin
-  case ARGV[0]
+  souls_command = ARGV[0]
+  case souls_command
   when "new"
     STRAINS = ["api", "worker", "console", "admin", "media"]
-    if ARGV[1].nil?
+    app_name = ARGV[1]
+    if app_name.nil?
       puts Paint["you need to specify your app name", :red]
       puts Paint["`souls new app_name`", :yellow]
       exit
@@ -29,12 +31,11 @@ begin
     strain = STDIN.gets.chomp.to_i
     case strain
     when 1, 2
-      Souls::Init.download_souls app_name: ARGV[1], repository_name: "souls_#{STRAINS[strain.to_i - 1]}"
-      Souls::Init.initial_config_init app_name: ARGV[1], strain: STRAINS[strain.to_i - 1]
+      Souls::Init.download_souls app_name: app_name, repository_name: "souls_#{STRAINS[strain.to_i - 1]}"
+      Souls::Init.initial_config_init app_name: app_name, strain: STRAINS[strain.to_i - 1]
     else
       puts Paint["Coming Soon...", :blue]
     end
-
   when "s", "server"
     strain = Souls.configuration.strain
     case strain
@@ -51,7 +52,8 @@ begin
     when "media", "admin"
       system "yarn dev"
     else
-      case ARGV[1]
+      rack_env = ARGV[1]
+      case rack_env
       when "RACK_ENV=production"
         system "RACK_ENV=production bundle exec irb"
       else
@@ -59,20 +61,28 @@ begin
       end
     end
   when "i", "infra"
-    Souls.send ARGV[1]
+    send_method = ARGV[1]
+    Souls.send send_method
   when "gcloud"
-    Souls::Gcloud.send ARGV[1]
+    status = Paint["Running Gcloud Commands...", :yellow]
+    Whirly.start spinner: "clock", interval: 420, stop: "🎉" do
+      Whirly.status = status
+      send_method = ARGV[1]
+      Souls::Gcloud.send send_method
+      Whirly.status = "Done!"
+    end
   when "-v", "--version"
-    puts Souls::VERSION
+    puts Paint[Souls::VERSION, :white]
   when "gem:update", "gemfile:update"
     status = Paint["Checking for updates...", :yellow]
-    Whirly.start spinner: "clock", interval: 1000, stop: "🎉" do
+    Whirly.start spinner: "clock", interval: 420, stop: "🎉" do
       Whirly.status = status
       Souls.update_gemfile
       Whirly.status = "Done!"
     end
   when "add"
-    case ARGV[1]
+    graphql_class = ARGV[1]
+    case graphql_class
     when "mutation"
       Souls::Init.add_mutation class_name: "user", file_name: "hoi"
     when "type"
@@ -84,82 +94,89 @@ begin
     when "rspec_mutation"
       Souls::Init.add_rspec_mutation class_name: "user", file_name: "hoi"
     else
-      puts "HOI!"
+      puts Paint["Wrong Argument!", :red]
     end
   when "g", "generate"
-    case ARGV[1]
+    graphql_class = ARGV[1]
+    class_name = ARGV[2]
+    case graphql_class
     when "test_dir"
       Souls::Generate.test_dir
     when "model"
-      Souls::Generate.model class_name: ARGV[2]
+      Souls::Generate.model class_name: class_name
     when "mutation"
-      Souls::Generate.mutation class_name: ARGV[2]
+      Souls::Generate.mutation class_name: class_name
     when "query"
-      Souls::Generate.query class_name: ARGV[2]
+      Souls::Generate.query class_name: class_name
     when "type"
-      Souls::Generate.type class_name: ARGV[2]
+      Souls::Generate.type class_name: class_name
     when "edge"
-      Souls::Generate.edge class_name: ARGV[2]
+      Souls::Generate.edge class_name: class_name
     when "connection"
-      Souls::Generate.connection class_name: ARGV[2]
+      Souls::Generate.connection class_name: class_name
     when "resolver"
-      Souls::Generate.resolver class_name: ARGV[2]
+      Souls::Generate.resolver class_name: class_name
     when "policy"
-      Souls::Generate.policy class_name: ARGV[2]
+      Souls::Generate.policy class_name: class_name
     when "rspec_factory"
-      Souls::Generate.rspec_factory class_name: ARGV[2]
+      Souls::Generate.rspec_factory class_name: class_name
     when "rspec_model"
-      Souls::Generate.rspec_model class_name: ARGV[2]
+      Souls::Generate.rspec_model class_name: class_name
     when "rspec_mutation"
-      Souls::Generate.rspec_mutation class_name: ARGV[2]
+      Souls::Generate.rspec_mutation class_name: class_name
     when "rspec_query"
-      Souls::Generate.rspec_query class_name: ARGV[2]
+      Souls::Generate.rspec_query class_name: class_name
     when "rspec_resolver"
-      Souls::Generate.rspec_resolver class_name: ARGV[2]
+      Souls::Generate.rspec_resolver class_name: class_name
     when "rspec_policy"
-      Souls::Generate.rspec_policy class_name: ARGV[2]
+      Souls::Generate.rspec_policy class_name: class_name
     when "node_type"
-      Souls::Generate.node_type class_name: ARGV[2]
+      Souls::Generate.node_type class_name: class_name
     when "job"
-      Souls::Generate.job class_name: ARGV[2]
+      Souls::Generate.job class_name: class_name
     when "migrate"
-      Souls::Generate.single_migrate class_name: ARGV[2]
+      Souls::Generate.single_migrate class_name: class_name
     when "migrate_all"
       Souls::Generate.migrate_all
     when "migration"
-      class_name = ARGV[2].underscore.pluralize
-      system "rake db:create_migration NAME=create_#{class_name}"
+      pluralized_class_name = class_name.underscore.pluralize
+      system "rake db:create_migration NAME=create_#{pluralized_class_name}"
     when "update"
-      Souls::Generate.update_delete class_name: ARGV[2]
-      Souls::Generate.single_migrate class_name: ARGV[2]
+      Souls::Generate.update_delete class_name: class_name
+      Souls::Generate.single_migrate class_name: class_name
     else
       "SOULs!"
     end
   when "d"
-    Souls::Generate.delete_all class_name: ARGV[1]
+    class_name = ARGV[1]
+    Souls::Generate.delete_all class_name: class_name
   when "db:create"
-    case ARGV[1]
+    rack_env = ARGV[1]
+    case rack_env
     when "RACK_ENV=production"
       system "rake db:create RACK_ENV=production"
     else
       system "rake db:create && rake db:create RACK_ENV=test"
     end
   when "db:migrate"
-    case ARGV[1]
+    rack_env = ARGV[1]
+    case rack_env
     when "RACK_ENV=production"
       system "rake db:migrate RACK_ENV=production"
     else
       system "rake db:migrate && rake db:migrate RACK_ENV=test"
     end
   when "db:seed"
-    case ARGV[1]
+    rack_env = ARGV[1]
+    case rack_env
     when "RACK_ENV=production"
       system "rake db:seed RACK_ENV=production"
     else
       system "rake db:seed"
     end
   when "db:migrate:reset"
-    case ARGV[1]
+    rack_env = ARGV[1]
+    case rack_env
     when "RACK_ENV=production"
       system "rake db:migrate:reset RACK_ENV=production DISABLE_DATABASE_ENVIRONMENT_CHECK=1"
     else
@@ -184,10 +201,11 @@ begin
     system "docker build . -t souls -f Dockerfile.dev"
     system "docker run --rm --env-file .env -p 3000:3000 souls:latest"
   when "deploy"
-    system "gcloud builds submit --config=cloudbuild.yml --project #{ARGV[1]}"
+    project_id = Souls.configuration.project_id
+    system "gcloud builds submit --config=cloudbuild.yml --project #{project_id}"
   else
     puts Paint["Welcome to SOULs!", :green]
   end
 rescue StandardError => error
-  puts Paint["Something Wrong...", :red]
+  puts Paint[error, :red]
 end

data/lib/souls.rb

@@ -77,7 +77,6 @@ module Souls
         updated_gems = []
         updated_gem_versions = []
         updated_lines = []
-        console_log = []
         from_dev = false
         File.open(file_path, "r") do |f|
           f.each_line do |line|
@@ -96,17 +95,11 @@ module Souls
             updated_gems << (gem[0]).to_s
             updated_gem_versions << data["version"]
             system "gem update #{gem[0]}"
-            console_log << if gem[0] == "souls"
-                            "#{gem[0]} v#{gem[1]} →　v#{data["version"]}\n\nSOULs Doc: https://souls.elsoul.nl"
-                           else
-                            "#{gem[0]} v#{gem[1]} →　v#{data["version"]}"
-                           end
           end
         end
         {
           gems: updated_gems,
           lines: updated_lines,
-          console_log: console_log,
           updated_gem_versions: updated_gem_versions
         }
       end
@@ -151,6 +144,9 @@ module Souls
                     }
                   ]
                 end
+                if gem[0] == "souls"
+                  logs << Paint["\nSOULs Doc: %{cyan_text}", :white, { cyan_text: ["https://souls.elsoul.nl\n", :cyan] }]
+                end
                 new_line.write "#{new_gems[:lines][@i]}\n"
                 @i += 1
               else

data/lib/souls/version.rb

@@ -1,3 +1,3 @@
 module Souls
-  VERSION = "0.23.0"
+  VERSION = "0.23.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 0.23.0
+  version: 0.23.4
 platform: ruby
 authors:
 - POPPIN-FUMI