potassium 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e42b19285cfdc9b98d8481a021a68a08dcb7fb6
-  data.tar.gz: faa3f6cefda09e5ca429b7d542b39ffdff80d24a
+  metadata.gz: e744bb4e04fa650c7190cfb645c050d0ff83691f
+  data.tar.gz: 588d03c4d1385f5d74387ab7720b32d45e3d2df3
 SHA512:
-  metadata.gz: 71899b46a6e1006027a2fa193f3eb802ef6fe0b8cea1be3cb9def2dbb4e9312cdb97ee3dc643893761e7a6a1c29023606ba9e225ef5a5939743c5dcd789a500e
-  data.tar.gz: 95725c1f5db91367b0b85eab121bab9ca47ae49b8f97e17c3b229d98897046eb2712f3cc8a9d134710da8e93abea29854b136129cf56dd95bf8fd21cb417624d
+  metadata.gz: 49627be487d9b2e423cc51cac06d135ca89b6c1e5e74d1facfd9a504d804ea4956fd6261fb91b1d2b27d9d03e428cadff4a8fc1fc2867d93411082ba730391b6
+  data.tar.gz: a723bb7e25ab5849b0b19cce675afd27a7083a1564937ed413189756166620dc77763c5cad3f1ea6827ae1065e19fc5ba04605f610797a3a8c7dfb6ae2e94cf0

data/.ruby-version

@@ -0,0 +1 @@
+2.2

data/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 ## Unreleased
 
+## 2.1.0
+
+- Fix discard_gem helper
+- Adds install command for database recipe
+- Remove check for heroku pipelines plugins, [#88]
+- Use postgresql by default, [#83]
+- Update ruby to `2.3.1` [#89]
+
 ## 2.0.0
 
 Features:

data/circle.yml

@@ -1,6 +1,6 @@
 machine:
   ruby:
-    version: 2.3.0
+    version: 2.3.1
   services:
     - docker
 

data/lib/potassium/assets/.dockerignore

@@ -0,0 +1,3 @@
+.bundle
+.env.local
+vendor/bundle

data/lib/potassium/assets/{.env.example.erb → .env.development.erb}

@@ -1,5 +1,3 @@
-APPLICATION_HOST=localhost:3000
-ASSET_HOST=localhost:3000
 AWS_ACCESS_KEY_ID=
 AWS_SECRET_ACCESS_KEY=
 DEFAULT_EMAIL_ADDRESS=

data/lib/potassium/assets/Dockerfile.ci

@@ -1,4 +1,6 @@
-FROM platanus/buildstep
-EXPOSE 3000
+FROM platanus/ruby:2.2
 
-RUN /exec bundle install --with test
+RUN mkdir /app
+WORKDIR /app
+
+ADD . /app

data/lib/potassium/assets/bin/cibuild.erb

@@ -1,27 +1,92 @@
 #!/usr/bin/env bash
+trap "exit" SIGINT SIGTERM
 
-DOCKE_COMPOSE_ARGS="-f docker-compose.ci.yml run"
+command -v docker >/dev/null 2>&1 && docker info >/dev/null || {
+  printf >&2 "\e[31mI require docker but it's not installed. Aborting.\e[0m\n"; exit 1;
+}
+
+DOCKER_COMPOSE_ARGS="-f docker-compose.ci.yml"
+
+# Build Image
+build(){
+  docker-compose $DOCKER_COMPOSE_ARGS build test
+}
+
+# Wait services to be ready
+wait_services(){
+  function test_service {
+    docker-compose $DOCKER_COMPOSE_ARGS run test sh -c "nc -z $1 $2"
+  }
+
+  count=0
+  # Chain tests together by using &&
+  until (
+  <% if(selected?(:database, :mysql) || selected?(:database, :postgresql))-%>
+  test_service '$<%=get(:database).to_s.upcase%>_HOST' '$<%=get(:database).to_s.upcase%>_PORT' && \
+  <% end-%>
+  echo "Services ready"
+  )
+  do
+    ((count++))
+    if [ $count -gt 50 ]
+    then
+      echo "Services didn't become ready in time"
+      exit 1
+    else
+      echo "Waiting for services to become ready..."
+    fi
+    sleep 0.5
+  done
+}
+
+# Prepare dependencies
+dependencies(){
+  docker-compose $DOCKER_COMPOSE_ARGS run test bundle install
+}
+
+# Prepare database
+database(){
+  docker-compose $DOCKER_COMPOSE_ARGS run test bundle exec rake db:create db:schema:load
+}
+
+# Run the specs
+tests(){
+  [ -n "$CI" ] && {
+    RSPEC_JUNIT_ARGS="-r rspec_junit_formatter --format RspecJunitFormatter -o $HOME/.rspec_reports/junit.xml"
+    RSPEC_FORMAT_ARGS="--format progress --no-color"
+  }
+  docker-compose $DOCKER_COMPOSE_ARGS run test bundle exec rspec spec $RSPEC_FORMAT_ARGS $RSPEC_JUNIT_ARGS
+}
 
-<% if(selected?(:database, :mysql) || selected?(:database, :postgresql))-%>
-function test_<%=get(:database).to_s%> {
-  docker-compose $DOCKE_COMPOSE_ARGS test sh -c 'nc -z $<%=get(:database).to_s.upcase%>_HOST $<%=get(:database).to_s.upcase%>_PORT'
+# Run the complete ci build
+no_ci(){
+  build
+  wait_services
+  dependencies
+  database
+  tests
 }
 
-count=0
-# Chain tests together by using &&
-until ( test_<%=get(:database).to_s%> && echo "Services ready" )
-do
-  ((count++))
-  if [ ${count} -gt 50 ]
-  then
-    echo "Services didn't become ready in time"
-    exit 1
-  else
-    echo "Waiting for services to become ready..."
-  fi
-  sleep 0.2
-done
-<% end-%>
-
-docker-compose $DOCKE_COMPOSE_ARGS test /exec bundle exec rake db:setup
-docker-compose $DOCKE_COMPOSE_ARGS test /exec bundle exec rspec spec
+case "$1" in
+  "")
+    no_ci
+    ;;
+  "services")
+    wait_services
+    ;;
+  "deps"|"dependencies")
+    dependencies
+    ;;
+  "db"|"database")
+    database
+    ;;
+  "specs"|"tests")
+    tests
+    ;;
+  "build")
+    build
+    ;;
+  *)
+    echo "Usage: cibuild [services|deps|db|specs|build]"
+    ;;
+esac

data/lib/potassium/assets/circle.yml

@@ -6,11 +6,13 @@ dependencies:
   override:
     - docker-compose -f docker-compose.ci.yml pull
     - docker-compose -f docker-compose.ci.yml build test
+    - bin/cibuild services
+    - bin/cibuild deps
 
 database:
   override:
-    - echo "Skipping database"
+    - bin/cibuild db
 
 test:
   override:
-    - bin/cibuild
+    - bin/cibuild tests

data/lib/potassium/assets/docker-compose.ci.yml

@@ -2,5 +2,8 @@ test:
   build: .
   dockerfile: Dockerfile.ci
   working_dir: '/app'
+  volumes:
+    - ./vendor/bundle:/usr/local/bundle
+    - $CIRCLE_TEST_REPORTS/rspec:$HOME/.rspec_reports
   environment:
     RAILS_ENV: test

data/lib/potassium/helpers/gem-helpers.rb

@@ -12,6 +12,7 @@ module GemHelpers
   end
 
   def discard_gem(name)
+    ensure_variable(:gems, {})
     get(:gems).each do |_environments, gems|
       gems.delete_if do |gem_entry|
         gem_entry[:name] == name

data/lib/potassium/recipes/ci.rb

@@ -9,6 +9,10 @@ class Recipes::Ci < Rails::AppBuilder
 
       copy_file '../assets/docker-compose.ci.yml', 'docker-compose.ci.yml'
 
+      gather_gems(:test) do
+        gather_gem 'rspec_junit_formatter', '0.2.2'
+      end
+
       compose = DockerHelpers.new('docker-compose.ci.yml')
 
       if selected?(:database, :mysql)

data/lib/potassium/recipes/database.rb

@@ -1,8 +1,8 @@
 class Recipes::Database < Rails::AppBuilder
   def ask
     databases = {
-      mysql: "MySQL",
       postgresql: "PostgreSQL",
+      mysql: "MySQL",
       none: "None, thanks"
     }
 
@@ -14,24 +14,31 @@ class Recipes::Database < Rails::AppBuilder
   end
 
   def create
-    databases = {
-      mysql: { name: 'mysql', gem_name: 'mysql2', version: '~> 0.3.18', relational: true },
-      postgresql: { name: 'postgresql', gem_name: 'pg', relational: true }
-    }
-
-    if db = databases[get(:database)]
+    if db = databases(get(:database))
       if db[:relational]
         activate_for_active_record(db)
       end
     end
   end
 
+  def install
+    ask
+    create
+  end
+
   private
 
+  def databases(database)
+    databases = {
+      postgresql: { name: 'postgresql', gem_name: 'pg', relational: true },
+      mysql: { name: 'mysql', gem_name: 'mysql2', version: '~> 0.3.18', relational: true }
+    }
+    databases[database]
+  end
+
   def activate_for_active_record(db)
     remove_file 'config/database.yml'
     template "../assets/config/database_#{db[:name]}.yml.erb", 'config/database.yml'
-
     discard_gem 'sqlite3'
     if db[:version]
       gather_gem db[:gem_name], db[:version]

data/lib/potassium/recipes/devise.rb

@@ -56,8 +56,7 @@ class Recipes::Devise < Rails::AppBuilder
         "# config.pepper = 'onhcylrat7x8bjyr5o15sxaix3vbu0sl'"
       end
 
-      append_to_file '.env.example', 'DEVISE_SECRET_KEY='
-      append_to_file '.env', 'DEVISE_SECRET_KEY='
+      append_to_file '.env.development', 'DEVISE_SECRET_KEY='
       add_readme_section :internal_dependencies, :devise
     end
   end

data/lib/potassium/recipes/env.rb

@@ -4,7 +4,16 @@ class Recipes::Env < Rails::AppBuilder
       gather_gem('dotenv-rails')
     end
 
-    template '../assets/.env.example.erb', '.env.example'
-    run "cp .env.example .env"
+    template '../assets/.env.development.erb', '.env.development'
+    append_to_file '.gitignore', ".env.local\n"
+    append_to_file '.gitignore', ".env\n"
+
+    env_config =
+      <<-RUBY.gsub(/^ {7}/, '')
+         config.before_configuration do
+           Dotenv.load(Dotenv::Railtie.root.join('.env.development'))
+         end
+         RUBY
+    application env_config.strip, env: 'test'
   end
 end

data/lib/potassium/recipes/git.rb

@@ -2,10 +2,6 @@ class Recipes::Git < Rails::AppBuilder
   def create
     git :init
     after(:database_creation) do
-      append_to_file '.gitignore', ".env\n"
-      append_to_file '.gitignore', ".powder\n"
-      append_to_file '.gitignore', "vendor/assets/bower_components\n"
-
       git add: "."
       git commit: %{ -m 'Initial commit' }
     end

data/lib/potassium/recipes/github.rb

@@ -10,12 +10,12 @@ class Recipes::Github < Rails::AppBuilder
       end
     end
     set(:github_repo_name, repo_name)
-    set(:github_repo_create, github_repo_create)
+    set(:github_repo, github_repo_create)
     set(:github_repo_private, github_repo_private)
   end
 
   def create
-    github_repo_create(get(:github_repo_name), get(:github_repo_private))
+    github_repo_create(get(:github_repo_name), get(:github_repo_private)) if selected?(:github_repo)
   end
 
   private

data/lib/potassium/recipes/heroku.rb

@@ -107,12 +107,6 @@ class Recipes::Heroku < Rails::AppBuilder
   end
 
   def add_app_to_pipeline(app_env_name, environment)
-    pipelines_plugin = `heroku plugins | grep pipelines`
-    if pipelines_plugin.empty?
-      puts "You need heroku pipelines plugin. Run: heroku plugins:install heroku-pipelines"
-      exit 1
-    end
-
     pipeline = `heroku pipelines:info \
       #{heroku_pipeline_name} 2>/dev/null | grep #{heroku_pipeline_name}`
     pipeline_command = pipeline.empty? ? "create" : "add"

data/lib/potassium/recipes/paperclip.rb

@@ -30,8 +30,8 @@ class Recipes::Paperclip < Rails::AppBuilder
          }
          RUBY
     application paperclip_config.strip, env: 'production'
-    append_to_file '.env.example', 'AWS_BUCKET='
-    append_to_file '.env', 'AWS_BUCKET='
+    append_to_file '.env.development', 'AWS_BUCKET='
+    append_to_file '.gitignore', "/public/system/*\n"
     add_readme_section :internal_dependencies, :paperclip
   end
 end

data/lib/potassium/recipes/pundit.rb

@@ -30,6 +30,20 @@ class Recipes::Pundit < Rails::AppBuilder
     gem_exists?(/pundit/)
   end
 
+  def install_admin_pundit
+    initializer = "config/initializers/active_admin.rb"
+    gsub_file initializer, /# config\.authorization_adapter =[^\n]+\n/ do
+      "config.authorization_adapter = ActiveAdmin::PunditAdapter\n"
+    end
+
+    template "../assets/active_admin/pundit_page_policy.rb",
+      "app/policies/active_admin/page_policy.rb"
+    template "../assets/active_admin/comment_policy.rb",
+      "app/policies/active_admin/comment_policy.rb"
+    template "../assets/active_admin/admin_user_policy.rb",
+      "app/policies/admin_user_policy.rb"
+  end
+
   private
 
   def run_pundit_installer
@@ -44,18 +58,4 @@ class Recipes::Pundit < Rails::AppBuilder
       add_readme_section :internal_dependencies, :pundit
     end
   end
-
-  def install_admin_pundit
-    initializer = "config/initializers/active_admin.rb"
-    gsub_file initializer, /# config\.authorization_adapter =[^\n]+\n/ do
-      "config.authorization_adapter = ActiveAdmin::PunditAdapter\n"
-    end
-
-    template "../assets/active_admin/pundit_page_policy.rb",
-      "app/policies/active_admin/page_policy.rb"
-    template "../assets/active_admin/comment_policy.rb",
-      "app/policies/active_admin/comment_policy.rb"
-    template "../assets/active_admin/admin_user_policy.rb",
-      "app/policies/admin_user_policy.rb"
-  end
 end

data/lib/potassium/recipes/ruby.rb

@@ -3,21 +3,17 @@ require 'semantic'
 
 class Recipes::Ruby < Rails::AppBuilder
   def create
-    info 'Getting platanus latest ruby version...'
     info "Using ruby version #{version_alias}"
     create_file '.ruby-version', version_alias
   end
 
   private
 
-  def latest
-    Net::HTTP.get(URI.parse('http://ruby.platan.us/latest'))
-  rescue
-    RUBY_VERSION
+  def version
+    Potassium::RUBY_VERSION
   end
 
   def version_alias
-    version = latest
     Semantic::Version.new(version).instance_eval { "#{major}.#{minor}" }
   end
 end

data/lib/potassium/recipes/style.rb

@@ -3,7 +3,7 @@ class Recipes::Style < Rails::AppBuilder
     copy_file '../assets/.rubocop.yml', '.rubocop.yml'
     copy_file '../assets/.ruby_style.yml', '.ruby_style.yml'
     copy_file '../assets/.hound.yml', '.hound.yml'
-    append_to_file '.gitignore', '.rubocop-http*\n'
+    append_to_file '.gitignore', ".rubocop-http*\n"
     add_readme_header :style_guide
   end
 

data/lib/potassium/version.rb

@@ -1,5 +1,6 @@
 module Potassium
-  VERSION = "2.0.0"
+  VERSION = "2.1.0"
+  RUBY_VERSION = "2.3.1"
   RAILS_VERSION = "~> 4.2.0"
   RUBOCOP_VERSION = "~> 0.38.0"
 end

data/spec/features/new_project_spec.rb

@@ -35,4 +35,18 @@ RSpec.describe "A new project" do
 
     expect(hound_config_file).to include("config_file: .ruby_style.yml")
   end
+
+  it "configures postgresql" do
+    database_config_file = IO.read("#{project_path}/config/database.yml")
+    gemfile = IO.read("#{project_path}/Gemfile")
+
+    expect(database_config_file).to include(%{adapter: postgresql})
+    expect(gemfile).to include %{gem 'pg'}
+  end
+
+  it "configures the correct ruby version" do
+    ruby_version_file = IO.read("#{project_path}/.ruby-version")
+
+    expect(ruby_version_file).to eq("2.3")
+  end
 end

data/spec/support/fake_heroku.rb

@@ -8,9 +8,7 @@ class FakeHeroku
   end
 
   def run!
-    if @args.first == "plugins"
-      puts "heroku-pipelines@0.29.0"
-    elsif @args.first == "pipelines:info"
+    if @args.first == "pipelines:info"
       if FakeHeroku.has_created_pipeline?
         puts "=== dummy-app\nstaging:\tpl-dummy-app-staging\nproduction:\tpl-dummy-app-production"
       end

data/spec/support/potassium_test_helpers.rb

@@ -52,7 +52,7 @@ module PotassiumTestHelpers
 
   def default_arguments
     {
-      "db" => "mysql",
+      "db" => "postgresql",
       "lang" => "es",
       "heroku" => false,
       "admin" => false,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: potassium
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - juliogarciag
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-22 00:00:00.000000000 Z
+date: 2016-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -177,6 +177,7 @@ files:
 - ".hound.yml"
 - ".rspec"
 - ".rubocop.yml"
+- ".ruby-version"
 - ".ruby_style.yml"
 - CHANGELOG.md
 - Gemfile
@@ -190,8 +191,9 @@ files:
 - lib/potassium.rb
 - lib/potassium/assets/.bowerrc
 - lib/potassium/assets/.buildpacks
+- lib/potassium/assets/.dockerignore
 - lib/potassium/assets/.editorconfig
-- lib/potassium/assets/.env.example.erb
+- lib/potassium/assets/.env.development.erb
 - lib/potassium/assets/.hound.yml
 - lib/potassium/assets/.pryrc
 - lib/potassium/assets/.rubocop.yml