dice_bag 0.9.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 60e5efa65c58bb068ea937851e75ace6470f3b0c
-  data.tar.gz: 56c46bf21478f61b2af8e5a3d689fc0204a4ef73
+  metadata.gz: a3aaa7d13ff48bfcf766fb7559829edab19fb14a
+  data.tar.gz: a35210f3327b715bf8bf77140558bb58dc33ed1c
 SHA512:
-  metadata.gz: 27e0e05915afc78875d92a57a1587f5efd75282f9985c124f28f6cbd59db012e77e75d2b51e97e8ab6d11ca5917774c0a1641c98a928d2d9ab63e704c6fb9df7
-  data.tar.gz: 95970fb430a7b7fac1c662d6b27033d5db905be6598f9aea21bc802366e1d19345241c62af9fa1a49dd307723cd134b49240f574cb6c0dca038b33ec514c8fd0
+  metadata.gz: 0a864f3e35d47e30bcaf4d31c7804467e1b7d3f783f858b665d081e478051368092cf822a4b01b4ddda72bd4730bd908eafeee67a5863aaf1155dd0e4001a790
+  data.tar.gz: fbae72a262f02e8c7f3d100a579582503b9bf7f67fe505479fbf38640ab08bab3a06c9595e92a86327bb51ab54fdfc69f31da1ed00d695104ec4dacd5d0fdcdc

data/lib/dice_bag/command.rb

@@ -3,12 +3,19 @@ require 'dice_bag/project'
 require 'dice_bag/config_file'
 require 'dice_bag/template_file'
 require 'dice_bag/default_template_file'
+require 'thor'
 
 module DiceBag
   #This class seems a candidate to be converted to Thor, the problem is that we need to run
   #in the same process than the rake task so all the gems are loaded before dice_bag
   #is called and dice_bag can find what software is used in this project
   class Command
+    include Thor::Base
+    include Thor::Actions
+
+    def self.source_root
+      Dir.pwd
+    end
 
     def write_all(params = {})
       Project.templates_to_generate.each do |template|
@@ -25,15 +32,14 @@ module DiceBag
     end
 
 
-    def generate_all_templates
+    def generate_all_templates(force=false)
       AvailableTemplates.all.each do |template|
-        generate_template(template)
+        generate_template(template, force)
       end
     end
 
-    def generate_template(default_template)
-      default_template.assert_existence
-      default_template.create_file
+    def generate_template(default_template, force=false)
+      copy_file default_template.file, default_template.destination, force: force
     end
 
   end

data/lib/dice_bag/default_template_file.rb

@@ -18,24 +18,8 @@ module DiceBag
       @filename = File.basename(name)
       @file = name
       @template_location = location
+      @destination = File.join(Project.root, @template_location, @filename)
     end
 
-    def create_file
-      contents = read_template(@file)
-      rooted_template_location = File.join(Project.root, @template_location)
-      FileUtils.mkdir_p(rooted_template_location)
-      template_file = File.join(rooted_template_location, @filename)
-      File.open(template_file, 'w') do |file|
-        file.puts(contents)
-      end
-      puts "new template file generated in #{template_file}.
-            execute 'rake config:all' to get the corresponding configuration file."
-    end
-
-    def read_template(template)
-      # Some templates need the name of the project. We put a placeholder
-      # PROJECT_NAME there, it gets substituted by the real name of the project here
-      File.readlines(template).join.gsub("PROJECT_NAME", Project.name)
-    end
   end
 end

data/lib/dice_bag/dice_bag_file.rb

@@ -4,7 +4,7 @@ require 'dice_bag/version'
 # configuration files, templates files in the project an templates files shipped with dicebag
 module DiceBag
   module DiceBagFile
-    attr_reader :file, :filename
+    attr_reader :file, :filename, :destination
     @@overwrite_all = false
 
     def assert_existence

data/lib/dice_bag/tasks/config.rake

@@ -22,16 +22,22 @@ namespace :config do
     DiceBag::Command.new.write(filename)
   end
 
-  desc "Generate all configuration file templates needed by this project"
+  desc 'Generate all configuration file templates with interactive commands (use config:generate_all:force to replace all without asking for input)'
   task :generate_all do
-    DiceBag::Command.new.generate_all_templates
+    DiceBag::Command.new.generate_all_templates(false)
   end
 
-  desc "Generate just the specified template, optionally in the specified location"
+  namespace :generate_all do
+    task :force do
+      DiceBag::Command.new.generate_all_templates(true)
+    end
+  end
+
+  desc 'Generate specified template, optionally in the specified location with options to control file actions'
   task :generate, :filename, :location do |t, args|
     filename = args[:filename]
     location = args[:location]
-    raise "A filename needs to be provided" if filename.nil?
-    DiceBag::Command.new.generate_template(DiceBag::DefaultTemplateFile.new(filename,location))
+    raise 'A filename needs to be provided' if filename.nil?
+    DiceBag::Command.new.generate_template(DiceBag::DefaultTemplateFile.new(filename, location), false)
   end
 end

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

@@ -7,9 +7,9 @@
 # cache configuration code in config/environments/production.rb
 
 development: &default
-  namespace: PROJECT_NAME
-  host: localhost
-  port: 11211
+  namespace: <%= configured.memcached_namespace || 'your_project_namespace' %>
+  host: <%= configured.memcached_host || 'localhost' %>
+  port: <%= configured.memcached_port || 11211 %>
   value_max_bytes: 52428800
   compress: true
 

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

@@ -7,10 +7,10 @@
   username: <%= configured[env].database_username || 'root' %>
   password: <%= configured[env].database_password %>
   host: <%= configured[env].database_host || 'localhost' %>
-  pool: 5
-  timeout: 5000
-  encoding: utf8
-  reconnect: false
+  pool: <%= configured[env].database_pool || 5 %>
+  timeout: <%= configured[env].database_timeout || 5000 %>
+  encoding:  <%= configured[env].database_encoding || 'utf8' %>
+  reconnect:  <%= configured[env].database_reconnect || false %>
   <% db_cert = configured[env].database_ssl_cert %>
   <%= db_cert ? "sslca: #{db_cert}" : '' %>
 <% end %>

data/lib/dice_bag/version.rb

@@ -1,3 +1,3 @@
 module DiceBag
-  VERSION = '0.9.0'
+  VERSION = '1.0.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dice_bag
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Andrew Smith
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-13 00:00:00.000000000 Z
+date: 2015-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -25,6 +25,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
+- !ruby/object:Gem::Dependency
+  name: diff-lcs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
@@ -119,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Dice Bag is a library of rake tasks for configuring web apps in the style