dice_bag 0.6.0 → 0.7.0

data/lib/dice_bag/command.rb

@@ -10,18 +10,18 @@ module DiceBag
   #is called and dice_bag can find what software is used in this project
   class Command
 
-    def write_all
+    def write_all(params = {})
       Project.templates_to_generate.each do |template|
-        write(template)
+        write(template, params)
       end
     end
 
-    def write(template_name)
+    def write(template_name, params = {})
       template_file = TemplateFile.new(template_name)
       template_file.assert_existence
       config_file = ConfigFile.new(template_name)
 
-      template_file.create_file(config_file)
+      template_file.create_file(config_file, params)
     end
 
 

data/lib/dice_bag/dice_bag_file.rb

@@ -5,7 +5,7 @@ require 'dice_bag/version'
 module DiceBag
   module DiceBagFile
     attr_reader :file, :filename
-    @@force = false
+    @@overwrite_all = false
 
     def assert_existence
       unless File.exists?(@file)
@@ -20,9 +20,7 @@ module DiceBag
     end
 
     def should_write?(new_contents)
-      #we always overwrite if we are inside an script or we are not development
-      return true if @@force || !$stdin.tty? || ENV['RAILS_ENV'] == 'test' || ENV['RAILS_ENV'] == 'production'
-      return true if !File.exists?(file)
+      return true if @@overwrite_all || !File.exists?(file)
       return false if diff(file, new_contents).empty?
 
       while true
@@ -35,7 +33,7 @@ module DiceBag
         when 'n'
           return false
         when 'a'
-          return @@force = true
+          return @@overwrite_all = true
         when 'q'
           exit
         when 'd'

data/lib/dice_bag/private_key.rb

@@ -0,0 +1,39 @@
+module DiceBag
+  class PrivateKey
+
+    attr_accessor :private_key
+    @@header = "-----BEGIN RSA PRIVATE KEY-----"
+    @@footer = "-----END RSA PRIVATE KEY-----"
+
+    def initialize(key)
+      @private_key = key
+    end
+
+    def is_valid_private_key?
+      require 'openssl'
+      begin
+        OpenSSL::PKey::RSA.new @private_key
+        return true  
+      rescue => e
+        p e.message
+        p e.backtrace
+        return false
+      end
+    end 
+
+    def to_rsa_format!
+      strip_down_key
+      body = @private_key.split(/\s+/)
+    	@private_key = [@@header, body, @@footer].flatten.join("\n")
+    end
+
+    private
+
+    def strip_down_key
+      @private_key.gsub!(@@header,"")
+      @private_key.gsub!(@@footer,"")
+      @private_key.strip!
+    end
+
+  end
+end

data/lib/dice_bag/tasks/config.rake

@@ -1,28 +1,33 @@
 require 'erb'
 require 'dice_bag/command'
 
-desc "Configure the application from the environment. It creates template files if you need and their config files"
+desc "Populate all templates using values from the environment to create configuration files"
 task :config => ['config:all']
 
 namespace :config do
-  desc "Create all the files from their templates in config/"
+  # Deprecated, present only for backward compatibility.
   task :all do
     DiceBag::Command.new.write_all
   end
 
-  desc "Recreate the file passed as parameter from its template"
+  desc "As per the config task but automatically overwrites pre-existing configuration files"
+  task :deploy do
+    DiceBag::Command.new.write_all(:deploy => true)
+  end
+
+  desc "Populate just the specified template to create the associated configuration file"
   task :file, :filename do |t, args|
     filename = args[:filename]
     raise "A filename needs to be provided" if filename.nil?
     DiceBag::Command.new.write(filename)
   end
 
-  desc "Generates all the template files needed by this project, named as the parameter."
+  desc "Generate all configuration file templates needed by this project"
   task :generate_all do
     DiceBag::Command.new.generate_all_templates
   end
 
-  desc "Regenerate a given template, params: filename of the template, location for the generated file[optional]"
+  desc "Generate just the specified template, optionally in the specified location"
   task :generate, :filename, :location do |t, args|
     filename = args[:filename]
     location = args[:location]

data/lib/dice_bag/template_file.rb

@@ -19,7 +19,7 @@ module DiceBag
       @file = Project.config_files(name)
     end
 
-    def create_file(config_file)
+    def create_file(config_file, params)
       # By passing "<>" we're trimming trailing newlines on lines that are
       # nothing but ERB blocks (see documentation). This is useful for files
       # like mauth_key where we want to control newlines carefully.
@@ -30,7 +30,7 @@ module DiceBag
       warning = Warning.new(@filename)
       contents = template.result(binding)
 
-      return unless config_file.should_write?(contents)
+      return unless params[:deploy] || config_file.should_write?(contents)
       config_file.write(contents)
       puts "File '#{config_file.file}' created"
     end

data/lib/dice_bag/template_helpers.rb

@@ -1,8 +1,21 @@
+require 'dice_bag/private_key'
+
 module DiceBag
   module TemplateHelpers
     def generate_private_key
       require 'openssl'
       OpenSSL::PKey::RSA.generate(2048)
     end
+
+    def ensure_is_private_key(key)
+    	pkey = PrivateKey.new key.dup
+      pkey.to_rsa_format!
+      if pkey.is_valid_private_key?
+        pkey.private_key
+      else
+        raise "The private key provided is invalid"
+      end
+    end
+
   end
 end

data/lib/dice_bag/templates/database.yml.dice

@@ -3,7 +3,7 @@
 <% [:development, :test, :production].each do |env| %>
 <%= env %>:
   adapter: <%= configured[env].database_driver || 'mysql2' %>
-  database: <%= configured[env].database_name || "PROJECT_NAME_#{env}" %>
+  database: <%= configured[env].database_name || "PROJECT_NAME_#{env}" %><%= ('<'+'%=ENV["TEST_ENV_NUMBER"] %'+'>') if (env == :test) %>
   username: <%= configured[env].database_username || 'root' %>
   password: <%= configured[env].database_password %>
   host: <%= configured[env].database_host || 'localhost' %>

data/lib/dice_bag/version.rb

@@ -1,3 +1,3 @@
 module DiceBag
-  VERSION = '0.6.0'
+  VERSION = '0.7.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dice_bag
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-25 00:00:00.000000000Z
+date: 2013-05-28 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &71579610 !ruby/object:Gem::Requirement
+  requirement: &86043750 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *71579610
+  version_requirements: *86043750
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &71579360 !ruby/object:Gem::Requirement
+  requirement: &86043500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 0.5.1
   type: :development
   prerelease: false
-  version_requirements: *71579360
+  version_requirements: *86043500
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &71579110 !ruby/object:Gem::Requirement
+  requirement: &86043250 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,7 +44,7 @@ dependencies:
         version: '2.12'
   type: :development
   prerelease: false
-  version_requirements: *71579110
+  version_requirements: *86043250
 description: 
 email:
 - asmith@mdsol.com
@@ -70,6 +70,7 @@ files:
 - lib/dice_bag/templates/google_analytics.yml.dice
 - lib/dice_bag/templates/aws.yml.dice
 - lib/dice_bag/railtie.rb
+- lib/dice_bag/private_key.rb
 - lib/dice_bag/configuration.rb
 - lib/dice_bag/tasks/config.rake
 - lib/dice_bag/available_templates.rb