orats 0.4.7 → 0.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4facabd4ef500af77eae28ddb61b5bf8ff6f68ab
-  data.tar.gz: 46feaec5b6c809844a111443a839ebb8d6faa8a4
+  metadata.gz: f6be8354b96425f8478851e1ea045f6403e9495d
+  data.tar.gz: 1899d9273b725545dab8c42aa15c7b3ccef81653
 SHA512:
-  metadata.gz: 845bb4a7b00e193d18b0351667598c08b6e7ab3caaeaaec4ac3353ff2b177b6b92f361ec05ff57be73c91c6ae8709d0b78284a01b9ad3549a70685b96dea2083
-  data.tar.gz: 615a354c334d995466bca2fdd4ca4b41b5368576052319c8e0d89c7f8d670ada755e32fa2b6b092d9c8dbd7e24c40c590eaa94fb0f5086c9ad537413544d92a9
+  metadata.gz: af1717c6c523ce94d1de05ef9f3c1297ba6da8c6793f3cb5f7c0ad50495e9f3531f923131d825d456767fe4d974e84df8b407e4a99052847ddbdd2881349054b
+  data.tar.gz: ffafb1ff48b0d58918aa1468109d14c2c137a3f7fa2e5edda6dc958d55ff98de06b664380fc7dd0283260042570ff0f5098c005e73947ec93ff5459b36d6dce5

data/lib/orats/shell.rb

@@ -27,8 +27,9 @@ module Orats
     def gsub_redis_info
       log_message 'root', 'Adding the redis password'
 
-      gsub_file "#{@active_path}/config/initializers/sidekiq.rb", '//', '//:#{ENV[\'TESTPROJ_CACHE_PASSWORD\']}@'
+      gsub_file "#{@active_path}/config/initializers/sidekiq.rb", '//', "//:#{ENV['#{@app_name.upcase}_CACHE_PASSWORD']}@"
       gsub_file "#{@active_path}/.env", ': greatsecurity', ": #{@options[:redis_password]}"
+      gsub_file "#{@active_path}/config/application.rb", "# pass", "pass"
     end
 
     def gsub_project_path
@@ -140,14 +141,24 @@ module Orats
       run "mkdir #{secrets_path}"
 
       save_secret_string "#{secrets_path}/postgres_password"
-      save_secret_string "#{secrets_path}/redis_password"
+
+      if @options[:redis_password].empty?
+        run "touch #{secrets_path}/redis_password"
+      else
+        save_secret_string "#{secrets_path}/redis_password"
+      end
+      
       save_secret_string "#{secrets_path}/mail_password"
       save_secret_string "#{secrets_path}/rails_token"
       save_secret_string "#{secrets_path}/devise_token"
       save_secret_string "#{secrets_path}/devise_pepper_token"
 
       log_message 'shell', 'Modifying secrets path in group_vars/all.yml'
-      update_secrets_path secrets_path
+      gsub_file "#{path}/inventory/group_vars/all.yml", '~/tmp/testproj/secrets/', secrets_path
+
+      log_message 'shell', 'Modifying the place holder app name in group_vars/all.yml'
+      gsub_file "#{path}/inventory/group_vars/all.yml", 'testproj', File.basename(path)
+      gsub_file "#{path}/inventory/group_vars/all.yml", 'TESTPROJ', File.basename(path).upcase
 
       log_message 'shell', 'Creating ssh keypair'
       run "ssh-keygen -t rsa -P '' -f #{secrets_path}/id_rsa"
@@ -157,7 +168,6 @@ module Orats
 
       log_message 'shell', 'Creating monit pem file'
       run "openssl req -new -newkey rsa:4096 -days 365 -nodes -x509 -subj '/C=US/ST=Foo/L=Bar/O=Baz/CN=qux.com' -keyout #{secrets_path}/monit.pem -out #{secrets_path}/monit.pem && openssl gendh 512 >> #{secrets_path}/monit.pem"
-
     end
 
     private
@@ -166,15 +176,6 @@ module Orats
         File.open(file, 'w+') { |f| f.write(SecureRandom.hex(64)) }
       end
 
-      def update_secrets_path(secrets_path)
-        all_yaml_path = "#{secrets_path}/../inventory/group_vars/all.yml"
-
-        IO.write(all_yaml_path, File.open(all_yaml_path) do |f|
-          f.read.gsub('~/tmp/testproj/secrets/', secrets_path)
-        end
-        )
-      end
-
       def copy_from_includes(file, destination_root_path)
         base_path = "#{File.expand_path File.dirname(__FILE__)}/templates/includes"
 

data/lib/orats/templates/base.rb

@@ -162,7 +162,7 @@ inject_into_file 'config/application.rb', after: "automatically loaded.\n" do <<
     config.cache_store = :redis_store, { host: ENV['#{app_name_upper}_CACHE_HOST'],
                                          port: ENV['#{app_name_upper}_CACHE_PORT'].to_i,
                                          db: ENV['#{app_name_upper}_CACHE_DATABASE'].to_i,
-                                         password: ENV['#{app_name_upper}_CACHE_PASSWORD'],
+                                         # password: ENV['#{app_name_upper}_CACHE_PASSWORD'].to_i,
                                          namespace: '#{app_name}::cache'
                                        }
 CODE

data/lib/orats/version.rb

@@ -1,3 +1,3 @@
 module Orats
-  VERSION = '0.4.7'
+  VERSION = '0.4.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orats
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.4.8
 platform: ruby
 authors:
 - Nick Janetakis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-29 00:00:00.000000000 Z
+date: 2014-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor