handsome_fencer-circle_c_i 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3da11873553927fd3f64baf13644519fd0f550f8342acb510b86a6436942afcd
-  data.tar.gz: e436861877e0dfc198e93c83f3edda801737d3efa210dfd9c3c4f6d22b52126c
+  metadata.gz: 042f6427f12410823e59a9f7e4d60ed98640c8bb00950a72ae9ad03e5ad714e9
+  data.tar.gz: 3658d0de2a4de63ddc657eb66a7dda846958f5030185691e31b7153525afdd35
 SHA512:
-  metadata.gz: 5670dc3c0a185ee73fa679971f64726451762380876d0113d67281fb812874d7b4d69ee84611372345cd900e9f78564fa4357d727525174730cf87e5409f87ec
-  data.tar.gz: cb82373b9072ece8577217bbc28cfed46c3176d90cb508c3807968209a9c59d6c12c9f3e1a372bb5ea9d917a7185f06be45c12a88c479ed5e6dbe9dfbc861145
+  metadata.gz: 581f9ae0c3cd48af19f2fdc7d630edbcda253dcf11abc106e3ae39a7dde0444cd3755c6da35a56eace03f3d78d3b85b2d370ef16cd4346ffcca79ee4c649f12a
+  data.tar.gz: c9bee3af2db0f2febbe5314fba32a918fd9e9a0f90bc6ace3c824d0061c93516ca176829e90adc4fa9231448d1cb21735694eb4ad481348686a120fec39cb30f

data/lib/generators/handsome_fencer/circle_c_i/deploy_key_generator.rb

@@ -6,13 +6,26 @@ module HandsomeFencer
       source_root File.expand_path('templates', __dir__)
       desc "generate deploy key"
 
+      class_option :environment, type: :string, default: 'deploy'
       def generate_deploy_key
+        environment = options[:environment]
         @cipher = OpenSSL::Cipher.new 'AES-128-CBC'
         @salt = '8 octets'
         @new_key = @cipher.random_key
 
-        create_file ".circleci/deploy.key", Base64.encode64(@new_key)
+        create_file ".circleci/#{environment}.key", Base64.encode64(@new_key)
       end
     end
   end
 end
+
+# desc 'copy keys to server'
+# task :environment_keys, [:source, :destination] do |task, args|
+#
+#   on server do
+#     within deploy_path do
+#       destination = args[:destination] || '.'
+#       upload! File.expand_path("../../#{args[:source]}", __dir__), destination='.'
+#     end
+#   end
+# end

data/lib/generators/handsome_fencer/circle_c_i/exposed_env_files_generator.rb

@@ -3,12 +3,15 @@ module HandsomeFencer
   module CircleCI
 
     class ExposedEnvFilesGenerator < Rails::Generators::Base
-      source_root File.expand_path('templates', __dir__)
       desc "expose .env files inside .circleci directory"
 
+      source_root File.expand_path('templates', __dir__)
+      class_option :environment, type: :string, default: 'deploy'
+
       def expose_env_files
-        @cipher = HandsomeFencer::CircleCI::Crypto.new
-        @cipher.expose
+        environment = options[:environment]
+        @cipher = HandsomeFencer::CircleCI::Crypto.new(dkfile: environment)
+        @cipher.expose('.circleci', "#{environment}.env.enc")
       end
     end
   end

data/lib/generators/handsome_fencer/circle_c_i/install_generator.rb

@@ -7,7 +7,7 @@ module HandsomeFencer
       desc "Sets up some necessary files for continuous deployments using docker and CircleCI"
 
       def copy_circle_templates
-        directory "circleci", ".circleci", recursive: true
+        directory "circleci", "./.circleci", recursive: true
       end
 
       def copy_deploy_task
@@ -18,6 +18,11 @@ module HandsomeFencer
         copy_file "docker-compose.yml", "docker-compose.yml"
       end
 
+      def copy_config_databas_yml
+        copy_file "config/database.yml", "config/database.yml"
+      end
+
+
       def insert_gitignores
         create_file '.gitignore' if File.exist? '.gitignore'
         append_to_file '.gitignore', "\n.circleci/**/*.env"

data/lib/generators/handsome_fencer/circle_c_i/obfuscated_env_files_generator.rb

@@ -3,12 +3,18 @@ module HandsomeFencer
   module CircleCI
 
     class ObfuscatedEnvFilesGenerator < Rails::Generators::Base
+
+      class_option :environment, type: :string, default: 'deploy'
+
       source_root File.expand_path('templates', __dir__)
       desc "obfuscate .env files inside .circleci directory"
 
       def obfuscate_env_files
-        @cipher = HandsomeFencer::CircleCI::Crypto.new
-        @cipher.obfuscate
+
+        environment = options[:environment]
+
+        @cipher = HandsomeFencer::CircleCI::Crypto.new(dkfile: environment)
+        @cipher.obfuscate('.circleci', "#{environment}.env")
       end
     end
   end

data/lib/generators/handsome_fencer/circle_c_i/templates/circleci/config.yml

@@ -9,8 +9,8 @@ jobs:
     machine: true
     steps:
       - checkout
-      - run: gem install handsomefencer-environment
-      - run: ruby expose_env.rb
+      - run: gem install handsome_fencer-circle_c_i
+      - run: ruby .circleci/expose_env.rb
       - run: docker-compose build dev_app database
       - run: docker-compose run dev_app bin/rails db:create db:migrate test
 

data/lib/generators/handsome_fencer/circle_c_i/templates/circleci/expose_env.rb

@@ -1,3 +1,3 @@
-require 'handsomefencer/environment'
-cipher = Handsomefencer::Environment::Crypto.new
+require 'handsome_fencer/circle_c_i/crypto'
+cipher = HandsomeFencer::CircleCI::Crypto.new
 cipher.expose

data/lib/generators/handsome_fencer/circle_c_i/templates/config/database.yml

@@ -0,0 +1,20 @@
+default: &default
+  adapter: postgresql
+  encoding: unicode
+  host:     <%= ENV.fetch('DATABASE_HOST') %>
+  username: <%= ENV.fetch('POSTGRES_USER') %>
+  password: <%= ENV.fetch('POSTGRES_PASSWORD') %>
+  database: <%= ENV.fetch('POSTGRES_DB') %>
+  pool: 5
+  variables:
+    statement_timeout: 5000
+
+development:
+  <<: *default
+
+test:
+  <<: *default
+
+
+production:
+  <<: *default

data/lib/handsome_fencer/circle_c_i/crypto.rb

@@ -1,26 +1,28 @@
 require 'openssl'
 require 'base64'
-
+require 'byebug'
 module HandsomeFencer
   module CircleCI
     class Crypto
 
       DeployKeyError = Class.new(StandardError)
 
-      def initialize
+      def initialize(options={})
+
         @cipher = OpenSSL::Cipher.new 'AES-128-CBC'
         @salt = '8 octets'
+        @dkfile = ".circleci/" + options[:dkfile] + ".key"
         @pass_phrase = get_deploy_key
       end
 
       def get_deploy_key
         case
-        when ENV['DEPLOY_KEY'].nil? && !File.exist?(dkfile)
+        when ENV['DEPLOY_KEY'].nil? && !File.exist?(@dkfile)
           raise DeployKeyError, "No deploy key set. Please generate a deploy key using '$ bin/rails generate handsome_fencer:circle_c_i:deploy_key' or set it using '$ export ENV['DEPLOY_KEY'] = some-complicated-key'"
+        when File.exist?(@dkfile)
+          Base64.decode64(File.read(@dkfile))
         when !ENV['DEPLOY_KEY'].nil?
           Base64.decode64(ENV['DEPLOY_KEY'])
-        when File.exist?(dkfile)
-          Base64.decode64(File.read(dkfile))
         end
       end
 
@@ -55,6 +57,7 @@ module HandsomeFencer
       end
 
       def decrypt(file)
+
         encrypted = Base64.decode64 File.read(file.to_s)
         @cipher.decrypt.pkcs5_keyivgen @pass_phrase, @salt
         decrypted = @cipher.update(encrypted) + @cipher.final
@@ -73,6 +76,9 @@ module HandsomeFencer
       end
 
       def expose(directory=nil, extension=nil)
+        # if @dkfile == '.circleci/production.key'
+        #   # byebug
+        # end
         extension = extension || '.env.enc'
         directory = directory || '.circleci'
         source_files(directory, extension).each { |file| decrypt(file) }

data/lib/handsome_fencer/circle_c_i/version.rb

@@ -1,5 +1,5 @@
 module HandsomeFencer
   module CircleCI
-    VERSION = '0.1.9'
+    VERSION = '0.1.10'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: handsome_fencer-circle_c_i
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - schadenfred
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-27 00:00:00.000000000 Z
+date: 2018-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sshkit
@@ -105,6 +105,7 @@ files:
 - lib/generators/handsome_fencer/circle_c_i/templates/circleci/containers/web/production.env
 - lib/generators/handsome_fencer/circle_c_i/templates/circleci/expose_env.rb
 - lib/generators/handsome_fencer/circle_c_i/templates/circleci/obfuscate_env.rb
+- lib/generators/handsome_fencer/circle_c_i/templates/config/database.yml
 - lib/generators/handsome_fencer/circle_c_i/templates/docker-compose.yml
 - lib/generators/handsome_fencer/circle_c_i/templates/lib/tasks/deploy.rake
 - lib/handsome_fencer/circle_c_i.rb