potassium 6.0.0 → 6.1.0

data/lib/potassium/recipes/database.rb

@@ -46,5 +46,9 @@ class Recipes::Database < Rails::AppBuilder
     else
       gather_gem db[:gem_name]
     end
+
+    after(:gem_install) do
+      generate 'strong_migrations:install'
+    end
   end
 end

data/lib/potassium/recipes/draper.rb

@@ -7,7 +7,6 @@ class Recipes::Draper < Rails::AppBuilder
   def create
     return unless selected?(:draper)
     add_draper
-    add_api_responder if selected?(:api_support)
   end
 
   def installed?
@@ -16,8 +15,6 @@ class Recipes::Draper < Rails::AppBuilder
 
   def install
     add_draper
-    api_recipe = load_recipe(:api)
-    add_api_responder if api_recipe.installed?
   end
 
   def add_draper
@@ -25,10 +22,4 @@ class Recipes::Draper < Rails::AppBuilder
     add_readme_section :internal_dependencies, :draper
     create_file 'app/decorators/.keep'
   end
-
-  def add_api_responder
-    after(:gem_install) do
-      copy_file '../assets/api/draper_responder.rb', 'app/responders/api_responder.rb', force: true
-    end
-  end
 end

data/lib/potassium/recipes/file_storage.rb

@@ -43,6 +43,7 @@ class Recipes::FileStorage < Rails::AppBuilder
     copy_file('../assets/config/shrine.rb', 'config/initializers/shrine.rb', force: true)
     copy_file('../assets/app/uploaders/image_uploader.rb', 'app/uploaders/image_uploader.rb')
     copy_file('../assets/app/uploaders/base_uploader.rb', 'app/uploaders/base_uploader.rb')
+    append_to_file('.gitignore', "/public/uploads\n")
   end
 
   def common_setup

data/lib/potassium/recipes/front_end.rb

@@ -26,6 +26,9 @@ class Recipes::FrontEnd < Rails::AppBuilder
       if value == :vue
         recipe.setup_vue_with_compiler_build
         recipe.setup_jest
+        if get(:api) == :graphql
+          recipe.setup_apollo
+        end
       end
       recipe.add_responsive_meta_tag
       recipe.setup_tailwind
@@ -83,6 +86,27 @@ class Recipes::FrontEnd < Rails::AppBuilder
     copy_file '../assets/app/javascript/app.spec.js', 'app/javascript/app.spec.js'
   end
 
+  def setup_apollo
+    run 'bin/yarn add vue-apollo graphql apollo-client apollo-link apollo-link-http apollo-cache-inmemory graphql-tag'
+
+    inject_into_file(
+      'app/javascript/packs/application.js',
+      apollo_imports,
+      after: "import App from '../app.vue';"
+    )
+
+    inject_into_file(
+      'app/javascript/packs/application.js',
+      apollo_loading,
+      after: "import VueApollo from 'vue-apollo';"
+    )
+    inject_into_file(
+      'app/javascript/packs/application.js',
+      "\n    apolloProvider,",
+      after: "components: { App },"
+    )
+  end
+
   private
 
   def frameworks(framework)
@@ -94,6 +118,35 @@ class Recipes::FrontEnd < Rails::AppBuilder
     frameworks[framework]
   end
 
+  def apollo_imports
+    <<~JS
+      \n
+      import { ApolloClient } from 'apollo-client';
+      import { createHttpLink } from 'apollo-link-http';
+      import { InMemoryCache } from 'apollo-cache-inmemory';
+      import VueApollo from 'vue-apollo';
+    JS
+  end
+
+  def apollo_loading
+    <<~JS
+      \n
+      const httpLink = createHttpLink({
+        uri: `${window.location.origin}/graphql`,
+      })
+      const cache = new InMemoryCache()
+      const apolloClient = new ApolloClient({
+        link: httpLink,
+        cache,
+      })
+
+      Vue.use(VueApollo)
+      const apolloProvider = new VueApollo({
+        defaultClient: apolloClient,
+      })
+    JS
+  end
+
   def setup_client_css
     application_css = 'app/javascript/css/application.css'
     create_file application_css, "", force: true
@@ -163,6 +216,15 @@ class Recipes::FrontEnd < Rails::AppBuilder
         },
         variants: {},
         plugins: [],
+        purge: {
+          enabled: process.env.NODE_ENV === 'production',
+          content: [
+            './app/**/*.html',
+            './app/**/*.vue',
+            './app/**/*.js',
+            './app/**/*.erb',
+          ],
+        }
       };
     JS
   end

data/lib/potassium/recipes/github.rb

@@ -1,29 +1,107 @@
+require 'octokit'
+
 class Recipes::Github < Rails::AppBuilder
   def ask
-    repo_name = "platanus/#{get(:dasherized_app_name)}"
     github_repo_create = answer(:github) do
-      q = "Do you want to create the Github repository (https://github.com/#{repo_name}) " +
-        "for this project?"
-      Ask.confirm(q)
-    end
-    if github_repo_create
-      github_repo_private = answer(:"github-private") do
-        Ask.confirm("Should the repository be private?")
-      end
+      Ask.confirm('Do you want to create a Github repository?')
     end
-    set(:github_repo_name, repo_name)
     set(:github_repo, github_repo_create)
-    set(:github_repo_private, github_repo_private)
+    setup_repo if github_repo_create
+  end
+
+  def setup_repo
+    setup_repo_private
+    setup_repo_org
+    setup_repo_name
+    set(:github_access_token, get_access_token)
   end
 
   def create
-    github_repo_create(get(:github_repo_name), get(:github_repo_private)) if selected?(:github_repo)
+    return unless selected?(:github_repo)
+
+    create_github_repo
+    copy_file '../assets/.github/pull_request_template.md', '.github/pull_request_template.md'
   end
 
   private
 
-  def github_repo_create(repo_name, private_repo = false)
-    flag = private_repo ? "-p" : ""
-    run "hub create #{flag} #{repo_name}"
+  def setup_repo_private
+    repo_private = answer(:github_private) do
+      Ask.confirm('Should the repository be private?')
+    end
+    set(:github_repo_private, repo_private)
+  end
+
+  def setup_repo_org
+    has_organization = answer(:github_has_org) do
+      Ask.confirm('Is this repo for a Github organization?')
+    end
+    set(:github_has_org, has_organization)
+    if has_organization
+      repo_organization = answer(:github_org) do
+        Ask.input('What is the organization for this repository?', default: 'platanus')
+      end
+      set(:github_org, repo_organization)
+    end
+  end
+
+  def setup_repo_name
+    repo_name = answer(:github_name) do
+      Ask.input('What is the name for this repository?', default: get(:dasherized_app_name))
+    end
+    set(:github_repo_name, repo_name)
+  end
+
+  def create_github_repo
+    options = { private: get(:github_repo_private) }
+    options[:organization] = get(:github_org) if get(:github_has_org)
+    repo_name = get(:github_repo_name)
+
+    is_retry = false
+    begin
+      github_client(is_retry).create_repository(repo_name, options)
+    rescue Octokit::Unauthorized
+      is_retry = true
+      retry if retry_create_repo
+    end
+  end
+
+  def retry_create_repo
+    puts "Bad credentials, information on Personal Access Tokens here:"
+    puts "https://docs.github.com/en/github/authenticating-to-github/creating-a-personal-access-token"
+    puts "Make sure to give repo access to the personal access token"
+    Ask.confirm("Do you want to retry?")
+  end
+
+  def github_client(is_retry = false)
+    access_token = is_retry ? set_access_token : get(:github_access_token)
+    octokit_client.new(access_token: access_token)
+  end
+
+  def octokit_client
+    if answer(:test)
+      require_relative '../../../spec/support/fake_octokit'
+      FakeOctokit
+    else
+      Octokit::Client
+    end
+  end
+
+  def get_access_token
+    return File.open(config_filename, 'r').read if File.exists?(config_filename)
+
+    set_access_token
+  end
+
+  def set_access_token
+    access_token = answer(:github_access_token) do
+      Ask.input('Enter a GitHub personal access token', password: true)
+    end
+    File.open(config_filename, 'w') { |f| f.write(access_token) }
+    access_token
+  end
+
+  def config_filename
+    @config_filename ||= File.expand_path('~/.potassium')
   end
 end

data/lib/potassium/version.rb

@@ -1,5 +1,5 @@
 module Potassium
-  VERSION = "6.0.0"
+  VERSION = "6.1.0"
   RUBY_VERSION = "2.7.0"
   RAILS_VERSION = "~> 6.0.2"
   RUBOCOP_VERSION = "~> 0.65.0"

data/potassium.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "pry", "~> 0.10.3"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.4.0"
   spec.add_development_dependency "rspec_junit_formatter"
   spec.add_development_dependency "rubocop", Potassium::RUBOCOP_VERSION
@@ -29,6 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "gli", "~> 2.12.2"
   spec.add_runtime_dependency "inquirer", "~> 0.2"
   spec.add_runtime_dependency "levenshtein", "~> 0.2"
+  spec.add_runtime_dependency "octokit", "~> 4.18"
   spec.add_runtime_dependency "rails", Potassium::RAILS_VERSION
   spec.add_runtime_dependency "semantic", "~> 1.4"
 end

data/spec/features/api_spec.rb

@@ -0,0 +1,25 @@
+require "spec_helper"
+
+RSpec.describe "Api" do
+  before :all do
+    drop_dummy_database
+    remove_project_directory
+    create_dummy_project("api" => :rest)
+  end
+
+  it "adds power_api related gems to Gemfile" do
+    gemfile_content = IO.read("#{project_path}/Gemfile")
+    expect(gemfile_content).to include("gem 'power_api'")
+    expect(gemfile_content).to include("gem 'rswag-specs'")
+  end
+
+  it "adds the power_api brief to README file" do
+    readme = IO.read("#{project_path}/README.md")
+    expect(readme).to include("Power API")
+  end
+
+  it "installs power_api" do
+    content = IO.read("#{project_path}/app/controllers/api/base_controller.rb")
+    expect(content).to include("Api::BaseController < PowerApi::BaseController")
+  end
+end

data/spec/features/background_processor_spec.rb

@@ -1,4 +1,5 @@
 require "spec_helper"
+require 'yaml'
 
 RSpec.describe "BackgroundProcessor" do
   context "working with sidekiq" do
@@ -41,6 +42,9 @@ RSpec.describe "BackgroundProcessor" do
     it "adds ENV vars" do
       content = IO.read("#{project_path}/.env.development")
       expect(content).to include("DB_POOL=25")
+      expect(content).to include('REDIS_HOST=127.0.0.1')
+      expect(content).to include('REDIS_PORT=$(make services-port SERVICE=redis PORT=6379)')
+      expect(content).to include('REDIS_URL=redis://${REDIS_HOST}:${REDIS_PORT}/1')
     end
 
     it "adds sidekiq.rb file" do
@@ -55,12 +59,19 @@ RSpec.describe "BackgroundProcessor" do
 
     it "adds redis.yml file" do
       content = IO.read("#{project_path}/config/redis.yml")
-      expect(content).to include("REDIS_HOST")
+      expect(content).to include("REDIS_URL")
     end
 
     it "mounts sidekiq app" do
       content = IO.read("#{project_path}/config/routes.rb")
       expect(content).to include("mount Sidekiq::Web => '/queue'")
     end
+
+    it 'adds redis to docker-compose' do
+      compose_file = IO.read("#{project_path}/docker-compose.yml")
+      compose_content = YAML.safe_load(compose_file, symbolize_names: true)
+
+      expect(compose_content[:services]).to include(:redis)
+    end
   end
 end

data/spec/features/draper_spec.rb

@@ -4,7 +4,7 @@ RSpec.describe "Draper" do
   before :all do
     drop_dummy_database
     remove_project_directory
-    create_dummy_project("draper" => true, "api" => true)
+    create_dummy_project("draper" => true)
   end
 
   it "adds the Draper gem to Gemfile" do
@@ -17,11 +17,6 @@ RSpec.describe "Draper" do
     expect(readme).to include("Draper")
   end
 
-  it "adds api responder to work with draper" do
-    responder_content = IO.read("#{project_path}/app/responders/api_responder.rb")
-    expect(responder_content).to include("decorated_resource")
-  end
-
   it "adds decorators directory" do
     content = IO.read("#{project_path}/app/decorators/.keep")
     expect(content).to be_empty

data/spec/features/file_storage_spec.rb

@@ -66,5 +66,10 @@ RSpec.describe "File Storage" do
       content = IO.read("#{project_path}/.env.development")
       expect(content).to include("S3_BUCKET=")
     end
+
+    it "adds filestorage path to gitignore" do
+      content = IO.read("#{project_path}/.gitignore")
+      expect(content).to include("/public/uploads")
+    end
   end
 end

data/spec/features/front_end_spec.rb

@@ -54,6 +54,20 @@ RSpec.describe "Front end" do
       )
       expect(tailwind_config_file).to include('module.exports')
     end
+
+    context "with graphql" do
+      before(:all) do
+        remove_project_directory
+        create_dummy_project("front_end" => "vue", "api" => "graphql")
+      end
+
+      it "creates a vue project with apollo" do
+        expect(node_modules_file).to include("\"vue-apollo\"")
+        expect(application_js_file).to include("import { ApolloClient } from 'apollo-client';")
+        expect(application_js_file).to include("Vue.use(VueApollo)")
+        expect(application_js_file).to include("apolloProvider,")
+      end
+    end
   end
 
   context "with angular" do

data/spec/features/github_spec.rb

@@ -1,22 +1,67 @@
 require "spec_helper"
 
 RSpec.describe "GitHub" do
+  let(:org_name) { "platanus" }
+  let(:repo_name) { PotassiumTestHelpers::APP_NAME.dasherize }
+  let(:access_token) { "1234" }
+  let(:pr_template_file) { IO.read("#{project_path}/.github/pull_request_template.md") }
+
   before do
     drop_dummy_database
     remove_project_directory
   end
 
-  it "create a the github repository" do
-    create_dummy_project("github" => true)
-    app_name = PotassiumTestHelpers::APP_NAME.dasherize
+  it "creates the github repository" do
+    create_dummy_project(
+      "github" => true,
+      "github_private" => false,
+      "github_has_org" => false,
+      "github_name" => repo_name,
+      "github_access_token" => access_token
+    )
+
+    expect(FakeOctokit).to have_created_repo(repo_name)
+    expect(pr_template_file).to include('Contexto')
+  end
+
+  it "creates the private github repository" do
+    create_dummy_project(
+      "github" => true,
+      "github_private" => true,
+      "github_has_org" => false,
+      "github_name" => repo_name,
+      "github_access_token" => access_token
+    )
+
+    expect(FakeOctokit).to have_created_private_repo(repo_name)
+    expect(pr_template_file).to include('Contexto')
+  end
+
+  it "creates the github repository for the organization" do
+    create_dummy_project(
+      "github" => true,
+      "github_private" => false,
+      "github_has_org" => true,
+      "github_org" => org_name,
+      "github_name" => repo_name,
+      "github_access_token" => access_token
+    )
 
-    expect(FakeGithub).to have_created_repo("platanus/#{app_name}")
+    expect(FakeOctokit).to have_created_repo_for_org(repo_name, org_name)
+    expect(pr_template_file).to include('Contexto')
   end
 
-  it "create a the github private repository" do
-    create_dummy_project("github" => true, "github-private" => true)
-    app_name = PotassiumTestHelpers::APP_NAME.dasherize
+  it "creates the private github repository for the organization" do
+    create_dummy_project(
+      "github" => true,
+      "github_private" => true,
+      "github_has_org" => true,
+      "github_org" => org_name,
+      "github_name" => repo_name,
+      "github_access_token" => access_token
+    )
 
-    expect(FakeGithub).to have_created_private_repo("platanus/#{app_name}")
+    expect(FakeOctokit).to have_created_private_repo_for_org(repo_name, org_name)
+    expect(pr_template_file).to include('Contexto')
   end
 end