sumcli 0.1.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94b43a29661d0deb26d7fe4cf3e0f2128a9812b82986f4a04fd7e34973545bff
-  data.tar.gz: 483c020c4eae626fcbc6ae98034239218cd02929b6cf0c86adbf95a232e17e16
+  metadata.gz: 1fb17357faf9b0a79218491f726464b6ed260d22f959873cefaed9a99e981174
+  data.tar.gz: 70c9974d8181fe817cf2a5dfc139d8454b66678e10870a75de6478bf986f4a8a
 SHA512:
-  metadata.gz: da0b86d8b42d721f6b6fa41da1c4d56715d9795fcdd06fc61bde51e56321754f5ea5d0275603400f602a5c2ffd36fb6badeea1742315a2229c906229b7db4261
-  data.tar.gz: 68fa839a31d1dc61f977bb7b5d544e36347ad5af4caa32e5c15d9e02af8fa98f08dc4a8601494dc586721527f2a2f5cfbecbd6ed249df2fc981c8abe8153b0cf
+  metadata.gz: 21e9b27cf7ade308bd38a1939695dfb3dd026d7b5c50ca20ff3333ce1b531adbf5f9252544996d4b97c05e1918ab8bfae6c79c896e3700b1e55fba22b48f9c55
+  data.tar.gz: 7f2ff870eb6d5248879ff34636eae35bf48ca797669c89eb7ec2f96f529abc191215a6832bd61e4d9e50a5ab1640a3ed2fb823a1ce8415fa82a5062a5f411701

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sumcli (0.1.0)
+    sumcli (0.4.0)
       activesupport (~> 5.0)
       pastel (~> 0.7.2)
       thor (~> 0.20.0)

data/lib/sumcli/cli.rb

@@ -18,11 +18,10 @@ module Sumcli
     end
     map %w(--version -v) => :version
 
-    require_relative 'commands/g'
     require_relative 'commands/new'
     require_relative 'commands/add'
-    register Sumcli::Commands::G, 'g', 'g endpoint', 'Generates a new REST endpoint'
-    register Sumcli::Commands::Add, 'add', 'add service', 'It adds a service to the docker file'
+    register Sumcli::Commands::Add, 'add', 'add [SUBCOMMAND]', 'Adds services to your project'
+    
     desc 'new NAME', 'Creates a new application'
     method_option :help, aliases: '-h', type: :boolean,
                          desc: 'Display usage information'

data/lib/sumcli/commands/add.rb

@@ -8,15 +8,27 @@ module Sumcli
 
       namespace :add
 
-      desc 'service NAME', 'Command description...'
+      desc 'service NAME', 'Installs infrastructure components and their initializers'
       method_option :help, aliases: '-h', type: :boolean,
                            desc: 'Display usage information'
-      def service(name)
+      def service(name, version = nil)
         if options[:help]
           invoke :help, ['service']
         else
           require_relative 'add/service'
-          Sumcli::Commands::Add::Service.new(name, options).execute
+          Sumcli::Commands::Add::Service.new(name, version, options).execute
+        end
+      end
+
+      desc 'endpoint NAME [METHOD] [ROUTE]', 'Generate a new endpoint using METHOD verb and matching url ROUTE'
+      method_option :help, aliases: '-h', type: :boolean,
+                           desc: 'Display usage information'
+      def endpoint(name, method = nil, route = nil)
+        if options[:help]
+          invoke :help, ['endpoint']
+        else
+          require_relative 'add/endpoint'
+          Sumcli::Commands::Add::Endpoint.new(name, method, route, options).execute
         end
       end
     end

data/lib/sumcli/commands/{g → add}/endpoint.rb

@@ -5,12 +5,15 @@ require_relative '../../command'
 
 module Sumcli
   module Commands
-    class G
+    class Add
       class Endpoint < Sumcli::Command
         ENDPOINT_PATH = 'api/endpoints'
+        MODELS_PATH = 'app/models'
         ENTITIES_PATH = 'api/entities'
         TESTS_PATH = 'spec/api'
 
+        TEMPLATES_PATH = File.expand_path('../../templates/add/endpoint', __dir__)
+
         def initialize(name, method, route, options)
           @name = name
           @method = method
@@ -26,6 +29,13 @@ module Sumcli
           inject_route unless @method.nil?
         end
 
+        def inject_mount
+          generator.inject_into_file("#{ENDPOINT_PATH}/base.rb", after: "# APIs\n") do <<-RB
+    mount API::#{@name.capitalize}
+    RB
+          end
+        end
+
         def inject_route
           generator.inject_into_file("#{ENDPOINT_PATH}/#{@name.underscore}.rb", after: "# ENDPOINTS\n") do <<-RB
       
@@ -42,7 +52,7 @@ module Sumcli
 
         def create_test
           generator.copy_file(
-            'lib/sumcli/templates/g/endpoint/test.rb.erb', 
+            "#{TEMPLATES_PATH}/test.rb.erb", 
             "#{TESTS_PATH}/#{@name.underscore}_spec.rb", 
             context: @variables
           )
@@ -50,7 +60,7 @@ module Sumcli
 
         def create_entity
           generator.copy_file(
-            'lib/sumcli/templates/g/endpoint/entity.rb.erb', 
+            "#{TEMPLATES_PATH}/entity.rb.erb", 
             "#{ENTITIES_PATH}/#{@name.underscore}.rb", 
             context: @variables
           )
@@ -58,10 +68,20 @@ module Sumcli
 
         def create_endpoint
           generator.copy_file(
-            'lib/sumcli/templates/g/endpoint/new.rb.erb', 
+            "#{TEMPLATES_PATH}/new.rb.erb", 
             "#{ENDPOINT_PATH}/#{@name.underscore}.rb", 
             context: @variables
           )
+
+          inject_mount
+        end
+
+        def create_model
+          generator.copy_file(
+            "#{TEMPLATES_PATH}/model.rb.erb", 
+            "#{MODELS_PATH}/#{@name.underscore}.rb", 
+            context: @variables
+          )
         end
       end
     end

data/lib/sumcli/commands/add/service.rb

@@ -8,21 +8,88 @@ module Sumcli
       class Service < Sumcli::Command
 
         DOCKER_FILE = 'docker-compose.yml'
+        TEMPLATES_PATH = File.expand_path('../../templates/add/service', __dir__)
+        CONFIGS_PATH = 'config'
         
-        def initialize(name, options)
+        def initialize(name, version, options)
           @name = name
+          @version = version
           @options = options
         end
 
         def execute(input: $stdin, output: $stdout)
-          self.send("add_#{@name}")
+          if !service_exists?
+            self.send("add_#{@name}")
+            output.puts "\n  #{@name} added to docker-compose"
+          else
+            output.puts "\n  #{@name} already added to docker-compose"
+          end
+        end
+
+        def copy_database_files
+          generator.inject_into_file('Gemfile', after: "# GEMS\n\n") do <<~RUBY
+            gem 'pg', '~> 1.1'
+            gem "otr-activerecord", '~> 1.3.0'
+            RUBY
+          end
+          generator.copy_file("#{TEMPLATES_PATH}/database.yml", "#{CONFIGS_PATH}/database.yml")
+          generator.copy_file("#{TEMPLATES_PATH}/database.yml.ctmpl", "#{CONFIGS_PATH}/database.yml.ctmpl")
+          generator.copy_file("#{TEMPLATES_PATH}/database.rb", "#{CONFIGS_PATH}/initializers/database.rb")
+          generator.inject_into_file("#{CONFIGS_PATH}/application.rb", after: "require_rel '../api'\n") do
+            'require_rel \'initializers\''
+          end
+          generator.inject_into_file('Rakefile', after: "# TASKS\n") do <<~RUBY.strip
+            load "tasks/otr-activerecord.rake"
+
+            namespace :db do
+              task :environment do
+                require_relative 'config/environment'
+              end
+            end
+            RUBY
+          end
+        end
+
+        def require_exists?
+          File.readlines(APPLICATION_FILE).grep(/#{INITIALIZERS_REQUIRE}/).any?
+        end
+
+        def add_postgres
+          ver = '10'
+          response = ask_to_set(ver) if ver != @version && !@version.nil?
+          ver = @version if response
+
+          content = 
+<<-TEXT
+  db:
+    image: 'postgres:#{ver}'
+    ports:
+      - '5432'
+TEXT
+
+          generator.safe_inject_into_file DOCKER_FILE, content, after: "services:\n"
+          copy_database_files
+        end
+
+        def add_redis
+          content = 
+<<-TEXT
+  redis:
+    image: 'redis:#{@version}'
+    ports:
+      - '6379'
+TEXT
+
+          generator.safe_inject_into_file DOCKER_FILE, content, after: "services:\n"
+        end
 
-          output.puts @name + ' added to docker-compose'
+        def service_exists?
+          File.readlines(DOCKER_FILE).grep(/#{@name}/).any?
         end
 
-        def add_postgres()
-          generator.inject_into_file DOCKER_FILE, 
-          "  db:\n" + "    image: 'postgres:9.6.3'\n" + "    ports:\n" + "      - '5432'", after: "services:\n" 
+        def ask_to_set(ver)
+          prompt.yes?("The default version of #{@name} is #{ver}." + 
+            "\n\nDo you want to add version #{@version}?")
         end
       end
     end

data/lib/sumcli/commands/add/service/postgres.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+require_relative '../../command'
+
+module Sumcli
+  module Commands
+    class Add
+      class Service
+        class Postgres < Sumcli::Command
+
+            DOCKER_FILE = 'docker-compose.yml'
+            
+            def initialize(name, version, options)
+            @name = name
+            @version = version
+            @options = options
+            end
+
+            def execute(input: $stdin, output: $stdout)
+            generator.copy_file 'lib/sumcli/templates/add/service/database.yml.erb', 
+            'config/database.yml'
+            generator.copy_file 'lib/sumcli/templates/add/service/database.yml.ctmpl.erb', 
+            'config/database.yml.ctmpl'
+
+            output.puts "\n  #{@name} added to docker-compose" if self.send("add_#{@name}")
+            end
+
+            def add_postgres
+            content = 
+<<-TEXT
+db:
+    image: 'postgres:#{@version}'
+    ports:
+    - '5432'
+TEXT
+
+            generator.safe_inject_into_file DOCKER_FILE, content, after: "services:\n"
+            end
+
+            def ask_to_set(ver)
+            prompt.yes?("The default version of #{@name} is #{ver}." + 
+                "\n\nDo you want to add with version #{@version}?")
+            end
+        end
+      end
+    end
+  end
+end

data/lib/sumcli/commands/new.rb

@@ -15,7 +15,8 @@ module Sumcli
 
         unless @name.nil? or File.directory?(@name)
           directory = File.expand_path('../../templates/new/app', __FILE__)
-          return generator.copy_directory(directory, @name)
+          generator.copy_directory(directory, @name)
+          return File.chmod(0744, "#{@name}/bin/console")
         end
 
         output.puts "Directory #{@name} already exists."

data/lib/sumcli/templates/add/endpoint/model.rb.erb

@@ -0,0 +1,4 @@
+class <%= name.capitalize %> < ActiveRecord::Base
+  
+end
+

data/lib/sumcli/templates/add/service/database.rb

@@ -0,0 +1,2 @@
+ActiveRecord::Base.default_timezone = :utc
+OTR::ActiveRecord.configure_from_hash!(Global.database.to_hash)

data/lib/sumcli/templates/add/service/database.rb.erb

@@ -0,0 +1,2 @@
+ActiveRecord::Base.default_timezone = :utc
+OTR::ActiveRecord.configure_from_hash!(Global.database.to_hash)

data/lib/sumcli/templates/add/service/database.yml

@@ -0,0 +1,20 @@
+development:
+  adapter: postgresql
+  encoding: utf8
+  pool: 5
+  host: localhost
+  port: 5432
+  username: postgres
+  password: ''
+  database: app
+
+test:
+  adapter: postgresql
+  encoding: utf8
+  pool: 5
+  host: localhost
+  port: 5432
+  username: postgres
+  password: ''
+  database: app
+  

data/lib/sumcli/templates/add/service/database.yml.ctmpl

@@ -0,0 +1,11 @@
+production:
+  encoding: unicode
+  adapter: postgresql
+  database: {{ with secret "secret/partners/database/name" }}{{ .Data.value }}{{ end }}
+  username: {{ with secret "secret/partners/database/username" }}{{ .Data.value }}{{ end }}
+  password: {{ with secret "secret/partners/database/password" }}{{ .Data.value }}{{ end }}
+  schema_search_path: {{ with secret "secret/partners/database/schema" }}{{ .Data.value }}{{ end }}
+  port: {{ keyOrDefault "service/partners/database/port" "5432" }}
+  host: {{ key "service/partners/database/host" }}
+  pool: {{ keyOrDefault "service/global/database/pool" "5" }}
+  timeout: {{ keyOrDefault "service/global/database/timeout" "5000" }}

data/lib/sumcli/templates/add/service/database.yml.erb

@@ -0,0 +1,19 @@
+development:
+  adapter: postgresql
+  encoding: utf8
+  pool: 5
+  host: localhost
+  port: 5432
+  username: postgres
+  password: ''
+  database: sidekiq
+
+test:
+  adapter: postgresql
+  encoding: utf8
+  pool: 5
+  host: localhost
+  port: 5432
+  username: postgres
+  password: ''
+  database: sidekiq

data/lib/sumcli/templates/new/app/Gemfile

@@ -4,6 +4,9 @@ source 'https://rubygems.org'
 
 ruby '2.6.2'
 
+# AUTO-GENERATED (DO NOT ERASE)
+# GEMS
+
 gem 'rack', '~> 2.0'
 gem 'grape', '~> 1.2'
 gem 'grape-entity', '~> 0.7'

data/lib/sumcli/templates/new/app/Rakefile

@@ -24,14 +24,8 @@
    end
  end
 
-# load "tasks/otr-activerecord.rake"
-
-namespace :db do
-  task :environment do
-    require_relative 'config/environment'
- end
-end
-
+# AUTO-GENERATED (DO NOT ERASE)
+# TASKS
 
  #Load tasks
  Dir.glob('lib/tasks/*.rake').each { |task| load task }

data/lib/sumcli/templates/new/app/api/endpoints/base.rb

@@ -10,6 +10,8 @@ module API
       end
     end
 
+    # AUTO-GENERATED (DO NOT ERASE)
+    # APIs
   end
 end
 

data/lib/sumcli/version.rb

@@ -1,3 +1,3 @@
 module Sumcli
-  VERSION = "0.1.0"
+  VERSION = "0.4.0"
 end

data/sumcli.gemspec

@@ -7,8 +7,8 @@ Gem::Specification.new do |spec|
   spec.name          = "sumcli"
   spec.license       = "MIT"
   spec.version       = Sumcli::VERSION
-  spec.authors       = ["Rodrigo Alves"]
-  spec.email         = ["rodrigo.souza@sumup.com"]
+  spec.authors       = ["Rodrigo Alves", "Danilo Lima", "Lucas Mari"]
+  spec.email         = ["rodrigo.souza@sumup.com", "danilo.lima@sumup.com", "lucas.mari@sumup.com"]
 
   spec.summary       = %q{Scaffolds SumUp microservices code.}
   spec.description   = %q{Scaffolds SumUp microservices code.}

metadata

@@ -1,14 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: sumcli
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Rodrigo Alves
+- Danilo Lima
+- Lucas Mari
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-04 00:00:00.000000000 Z
+date: 2019-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tty-box
@@ -363,6 +365,8 @@ dependencies:
 description: Scaffolds SumUp microservices code.
 email:
 - rodrigo.souza@sumup.com
+- danilo.lima@sumup.com
+- lucas.mari@sumup.com
 executables:
 - sumcli
 extensions: []
@@ -386,16 +390,22 @@ files:
 - lib/sumcli/command.rb
 - lib/sumcli/commands/.gitkeep
 - lib/sumcli/commands/add.rb
+- lib/sumcli/commands/add/endpoint.rb
 - lib/sumcli/commands/add/service.rb
-- lib/sumcli/commands/g.rb
-- lib/sumcli/commands/g/endpoint.rb
+- lib/sumcli/commands/add/service/postgres.rb
 - lib/sumcli/commands/new.rb
 - lib/sumcli/templates/.gitkeep
+- lib/sumcli/templates/add/endpoint/.gitkeep
+- lib/sumcli/templates/add/endpoint/entity.rb.erb
+- lib/sumcli/templates/add/endpoint/model.rb.erb
+- lib/sumcli/templates/add/endpoint/new.rb.erb
+- lib/sumcli/templates/add/endpoint/test.rb.erb
 - lib/sumcli/templates/add/service/.gitkeep
-- lib/sumcli/templates/g/endpoint/.gitkeep
-- lib/sumcli/templates/g/endpoint/entity.rb.erb
-- lib/sumcli/templates/g/endpoint/new.rb.erb
-- lib/sumcli/templates/g/endpoint/test.rb.erb
+- lib/sumcli/templates/add/service/database.rb
+- lib/sumcli/templates/add/service/database.rb.erb
+- lib/sumcli/templates/add/service/database.yml
+- lib/sumcli/templates/add/service/database.yml.ctmpl
+- lib/sumcli/templates/add/service/database.yml.erb
 - lib/sumcli/templates/new/.gitkeep
 - lib/sumcli/templates/new/app/.editorconfig
 - lib/sumcli/templates/new/app/.gitignore

data/lib/sumcli/commands/g.rb

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-require 'thor'
-
-module Sumcli
-  module Commands
-    class G < Thor
-
-      namespace :g
-
-      desc 'endpoint NAME METHOD ROUTE', 'Generate a new endpoint using METHOD verb and matching url ROUTE'
-      method_option :help, aliases: '-h', type: :boolean,
-                           desc: 'Display usage information'
-      def endpoint(name, method = nil, route = nil)
-        if options[:help]
-          invoke :help, ['endpoint']
-        else
-          require_relative 'g/endpoint'
-          Sumcli::Commands::G::Endpoint.new(name, method, route, options).execute
-        end
-      end
-    end
-  end
-end