souls 0.22.3 → 0.22.7

data/lib/souls.rb

@@ -7,6 +7,7 @@ require "json"
 require "fileutils"
 require "net/http"
 require "paint"
+require "whirly"
 
 module Souls
   SOULS_METHODS = [
@@ -41,9 +42,9 @@ module Souls
       def run_mysql
         system "docker run --rm -d \
           -p 3306:3306 \
-          -v mysql-tmp:/var/lib/mysqlql/data \
+          -v mysql-tmp:/var/lib/mysql \
           -e MYSQL_USER=mysql \
-          -e MYSQL_PASSWORD=mysql \
+          -e MYSQL_ROOT_PASSWORD=mysql \
           -e MYSQL_DB=souls_test \
           mysql:latest"
         system "docker ps"
@@ -54,21 +55,44 @@ module Souls
         system "gcloud scheduler jobs create http #{app}-awake --schedule '0,10,20,30,40,50 * * * *' --uri #{url} --http-method GET"
       end
 
+      def show_wait_spinner(fps = 10)
+        chars = %w[| / - \\]
+        delay = 1.0 / fps
+        iter = 0
+        spinner = Thread.new do
+          while iter
+            print chars[(iter += 1) % chars.length]
+            sleep delay
+            print "\b"
+          end
+        end
+        yield.tap do
+          iter = false
+          spinner.join
+        end
+      end
+
       def gemfile_latest_version
         file_path = "./Gemfile"
         updated_gems = []
         updated_gem_versions = []
         updated_lines = []
         console_log = []
+        from_dev = false
         File.open(file_path, "r") do |f|
           f.each_line do |line|
+            from_dev = true if line.include? "group"
             next unless line.include? "gem "
             gem = line.gsub("gem ", "").gsub("\"", "").gsub("\n", "").gsub(" ", "").split(",")
             url = URI("https://rubygems.org/api/v1/versions/#{gem[0]}/latest.json")
             res = Net::HTTP.get_response(url)
             data = JSON.parse res.body
             next if data["version"].to_s == gem[1].to_s
-            updated_lines << "gem \"#{gem[0]}\", \"#{data["version"]}\""
+            updated_lines << if from_dev
+              "  gem \"#{gem[0]}\", \"#{data["version"]}\""
+                             else
+              "gem \"#{gem[0]}\", \"#{data["version"]}\""
+                             end
             updated_gems << (gem[0]).to_s
             updated_gem_versions << data["version"]
             system "gem update #{gem[0]}"
@@ -88,21 +112,41 @@ module Souls
         tmp_file = "./tmp/Gemfile"
         new_gems = gemfile_latest_version
         logs = []
-        return "Already Up to date!" && puts("Already Up to date!") if new_gems[:gems].blank?
+        message = Paint["\nAlready Up to date!", :green]
+        return "Already Up to date!" && puts(message) if new_gems[:gems].blank?
         @i = 0
         File.open(file_path, "r") do |f|
           File.open(tmp_file, "w") do |new_line|
             f.each_line do |line|
               gem = line.gsub("gem ", "").gsub("\"", "").gsub("\n", "").gsub(" ", "").split(",")
               if new_gems[:gems].include? gem[0]
-                logs << Paint % [
-                  "#{gem[0]} %{yellow_text} → %{green_text}",
-                  :blue,
-                  {
-                    yellow_text: ["v#{gem[1]}", :yellow],
-                    green_text: ["v#{new_gems[:updated_gem_versions][@i]}", :green]
-                  }
-                ]
+                old_ver = gem[1].split(".")
+                new_ver = new_gems[:updated_gem_versions][@i].split(".")
+                if old_ver[0] < new_ver[0]
+                  logs << Paint % [
+                    "#{gem[0]} v#{gem[1]} → %{red_text}",
+                    :white,
+                    {
+                      red_text: ["v#{new_gems[:updated_gem_versions][@i]}", :red]
+                    }
+                  ]
+                elsif old_ver[1] < new_ver[1]
+                  logs << Paint % [
+                    "#{gem[0]} v#{gem[1]} → v#{new_ver[0]}.%{yellow_text}",
+                    :white,
+                    {
+                      yellow_text: ["#{new_ver[1]}.#{new_ver[2]}", :yellow]
+                    }
+                  ]
+                elsif old_ver[2] < new_ver[2]
+                  logs << Paint % [
+                    "#{gem[0]} v#{gem[1]} → v#{new_ver[0]}.#{new_ver[1]}.%{green_text}",
+                    :white,
+                    {
+                      green_text: [(new_ver[2]).to_s, :green]
+                    }
+                  ]
+                end
                 new_line.write "#{new_gems[:lines][@i]}\n"
                 @i += 1
               else

data/lib/souls/generate/mutation.rb

@@ -83,12 +83,10 @@ module Souls
         file_path = "./app/graphql/mutations/base/#{class_name}/create_#{class_name}.rb"
         File.open(file_path, "a") do |new_line|
           new_line.write <<~EOS
-                    #{class_name} = ::#{class_name.camelize}.new args
-                    if #{class_name}.save
-                      { #{class_name}_edge: { node: #{class_name} } }
-                    else
-                      { error: #{class_name}.errors.full_messages }
-                    end
+                    data = ::#{class_name.camelize}.new args
+                    raise(StandardError, data.errors.full_messages) unless data.save
+
+                    { #{class_name}_edge: { node: data } }
                   rescue StandardError => error
                     GraphQL::ExecutionError.new error
                   end

data/lib/souls/init.rb

@@ -29,8 +29,11 @@ module Souls
         system "tar -zxvf ./#{version}.tar.gz"
         system "mkdir #{app_name}"
         folder = version.delete "v"
-        system "cp -r #{repository_name}-#{folder}/. #{app_name}/"
-        system "rm -rf #{version}.tar.gz && rm -rf #{repository_name}-#{folder}"
+        `cp -r #{repository_name}-#{folder}/. #{app_name}/`
+        `rm -rf #{version}.tar.gz && rm -rf #{repository_name}-#{folder}`
+        line = Paint["====================================", :yellow]
+        puts "\n"
+        puts line
         txt = <<~TEXT
              _____ ____  __  ____#{'        '}
             / ___// __ \\/ / / / /   _____
@@ -38,13 +41,17 @@ module Souls
            ___/ / /_/ / /_/ / /___(__  )#{' '}
           /____/\\____/\\____/_____/____/#{'  '}
         TEXT
-        puts txt
-        puts "=============================="
-        puts "Welcome to SOULs!"
-        puts "SOULs Version: #{Souls::VERSION}"
-        puts "=============================="
-        puts "$ cd #{app_name}"
-        puts "------------------------------"
+        message = Paint[txt, :blue]
+        puts message
+        puts line
+        welcome = Paint["Welcome to SOULs!", :white]
+        puts welcome
+        souls_ver = Paint["SOULs Version: #{Souls::VERSION}", :white]
+        puts souls_ver
+        puts line
+        cd = Paint["Easy to Run\n$ cd #{app_name}\n$ bundle\n$ souls s\nGo To : http://localhost:3000\n\nDoc: https://souls-doc.el-soul.com", :white]
+        puts cd
+        puts line
       end
     end
   end

data/lib/souls/version.rb

@@ -1,3 +1,3 @@
 module Souls
-  VERSION = "0.22.3"
+  VERSION = "0.22.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 0.22.3
+  version: 0.22.7
 platform: ruby
 authors:
 - POPPIN-FUMI
@@ -43,6 +43,120 @@ files:
 - config/souls.rb
 - db/schema.rb
 - exe/souls
+- hoy/.env.sample
+- hoy/.gitignore
+- hoy/.irbrc
+- hoy/.rspec
+- hoy/.rubocop.yml
+- hoy/.ruby-version
+- hoy/CODE_OF_CONDUCT.md
+- hoy/Dockerfile
+- hoy/Dockerfile.dev
+- hoy/Gemfile
+- hoy/Gemfile.lock
+- hoy/LICENSE.txt
+- hoy/Procfile
+- hoy/Procfile.dev
+- hoy/README.md
+- hoy/Rakefile
+- hoy/app.rb
+- hoy/app/graphql/mutations/.keep
+- hoy/app/graphql/mutations/base/article/create_article.rb
+- hoy/app/graphql/mutations/base/article/delete_article.rb
+- hoy/app/graphql/mutations/base/article/destroy_delete_article.rb
+- hoy/app/graphql/mutations/base/article/update_article.rb
+- hoy/app/graphql/mutations/base/article_category/create_article_category.rb
+- hoy/app/graphql/mutations/base/article_category/delete_article_category.rb
+- hoy/app/graphql/mutations/base/article_category/destroy_delete_article_category.rb
+- hoy/app/graphql/mutations/base/article_category/update_article_category.rb
+- hoy/app/graphql/mutations/base/user/create_user.rb
+- hoy/app/graphql/mutations/base/user/delete_user.rb
+- hoy/app/graphql/mutations/base/user/destroy_delete_user.rb
+- hoy/app/graphql/mutations/base/user/update_user.rb
+- hoy/app/graphql/mutations/base_mutation.rb
+- hoy/app/graphql/mutations/user_manager/add_user_role.rb
+- hoy/app/graphql/mutations/user_manager/remove_user_role.rb
+- hoy/app/graphql/mutations/user_manager/sign_in_user.rb
+- hoy/app/graphql/queries/article.rb
+- hoy/app/graphql/queries/article_categories.rb
+- hoy/app/graphql/queries/article_category.rb
+- hoy/app/graphql/queries/articles.rb
+- hoy/app/graphql/queries/base_query.rb
+- hoy/app/graphql/queries/me.rb
+- hoy/app/graphql/queries/user.rb
+- hoy/app/graphql/queries/users.rb
+- hoy/app/graphql/resolvers/article_category_search.rb
+- hoy/app/graphql/resolvers/article_search.rb
+- hoy/app/graphql/resolvers/base.rb
+- hoy/app/graphql/resolvers/user_search.rb
+- hoy/app/graphql/souls_api_schema.rb
+- hoy/app/graphql/types/.keep
+- hoy/app/graphql/types/article_category_type.rb
+- hoy/app/graphql/types/article_type.rb
+- hoy/app/graphql/types/base/base_argument.rb
+- hoy/app/graphql/types/base/base_enum.rb
+- hoy/app/graphql/types/base/base_field.rb
+- hoy/app/graphql/types/base/base_input_object.rb
+- hoy/app/graphql/types/base/base_interface.rb
+- hoy/app/graphql/types/base/base_object.rb
+- hoy/app/graphql/types/base/base_scalar.rb
+- hoy/app/graphql/types/base/base_union.rb
+- hoy/app/graphql/types/base/mutation_type.rb
+- hoy/app/graphql/types/base/query_type.rb
+- hoy/app/graphql/types/connections/article_category_connection.rb
+- hoy/app/graphql/types/connections/article_connection.rb
+- hoy/app/graphql/types/connections/base_connection.rb
+- hoy/app/graphql/types/connections/user_connection.rb
+- hoy/app/graphql/types/edges/article_category_edge.rb
+- hoy/app/graphql/types/edges/article_edge.rb
+- hoy/app/graphql/types/edges/base_edge.rb
+- hoy/app/graphql/types/edges/user_edge.rb
+- hoy/app/graphql/types/user_type.rb
+- hoy/app/models/article.rb
+- hoy/app/models/article_category.rb
+- hoy/app/models/user.rb
+- hoy/app/policies/application_policy.rb
+- hoy/app/policies/article_category_policy.rb
+- hoy/app/policies/article_policy.rb
+- hoy/app/policies/user_policy.rb
+- hoy/app/utils/association_loader.rb
+- hoy/app/utils/firebase_id_token.rb
+- hoy/app/utils/json_web_token.rb
+- hoy/app/utils/record_loader.rb
+- hoy/app/utils/souls_helper.rb
+- hoy/cloudbuild.yml
+- hoy/config.ru
+- hoy/config/database.yml
+- hoy/config/souls.rb
+- hoy/constants/areas.rb
+- hoy/constants/column_name_ja.rb
+- hoy/db/migrate/20200006095538_create_users.rb
+- hoy/db/migrate/20200712180236_create_article_categories.rb
+- hoy/db/migrate/20200714215521_create_articles.rb
+- hoy/db/schema.rb
+- hoy/db/seeds.rb
+- hoy/github/workflows/delivery.yml
+- hoy/log/.keep
+- hoy/spec/factories/article_categories.rb
+- hoy/spec/factories/articles.rb
+- hoy/spec/factories/users.rb
+- hoy/spec/models/article_category_spec.rb
+- hoy/spec/models/article_spec.rb
+- hoy/spec/models/user_spec.rb
+- hoy/spec/mutations/base/article_category_spec.rb
+- hoy/spec/mutations/base/article_spec.rb
+- hoy/spec/mutations/base/user_spec.rb
+- hoy/spec/policies/article_category_policy_spec.rb
+- hoy/spec/policies/article_policy_spec.rb
+- hoy/spec/policies/user_policy_spec.rb
+- hoy/spec/queries/article_category_spec.rb
+- hoy/spec/queries/article_spec.rb
+- hoy/spec/queries/user_spec.rb
+- hoy/spec/resolvers/article_category_search_spec.rb
+- hoy/spec/resolvers/article_search_spec.rb
+- hoy/spec/resolvers/user_search_spec.rb
+- hoy/spec/spec_helper.rb
+- hoy/tmp/.keep
 - lib/souls.rb
 - lib/souls/gcloud.rb
 - lib/souls/gcloud/compute.rb