dice_bag 0.4.0 → 0.4.1

data/lib/dice_bag/config_file.rb

@@ -8,7 +8,7 @@ module DiceBag
     include DiceBagFile
     def initialize(name)
       @filename = name.gsub('.local', '').gsub('.erb', '').gsub('.template','')
-      @file = @filename
+      @file = Project.config_files(@filename)
     end
   end
 end

data/lib/dice_bag/project.rb

@@ -10,18 +10,25 @@ module DiceBag
     end
 
     def self.config_files(filename)
-      File.join(Dir.pwd, filename)
+      File.join(self.config_dir, filename)
+    end
+
+    # dotNet apps do not have the templates in config/ but in the root of the project
+    # TODO: detect dotNet instead of detecting rails
+    def self.config_dir
+      defined?(Rails) ? File.join(Dir.pwd, 'config') : Dir.pwd
     end
 
     #local templates always takes preference over generated templates
     def self.templates_to_generate
-      generated_templates = Dir[Project.config_files("**/config/*.erb")]
-      custom_templates = Dir[Project.config_files("**/config/*.erb.local")]
+      generated_templates = Dir[Project.config_files("**/*.erb")]
+      custom_templates = Dir[Project.config_files("**/*.erb.local")]
       dotNetTemplates = Dir[Project.config_files("**/*.config.template")]
       all_files = generated_templates + custom_templates
-      templates = all_files.delete_if {|file| custom_templates.include?(file + '.local')}
+      cleaned_templates = all_files.delete_if {|file| custom_templates.include?(file + '.local')}
       dotNetTemplates = dotNetTemplates.delete_if {|file| file.include?("/bin/")}
-      all_files + dotNetTemplates
+      (cleaned_templates + dotNetTemplates).map { |template| File.basename(template) }
     end
+
   end
 end

data/lib/dice_bag/template_file.rb

@@ -16,7 +16,7 @@ module DiceBag
 
     def initialize(name)
       @filename = File.basename(name)
-      @file = name
+      @file = Project.config_files(name)
     end
 
     def create_file(config_file)
@@ -32,7 +32,7 @@ module DiceBag
 
       return unless config_file.should_write?(contents)
       config_file.write(contents)
-      puts "file #{config_file.file} created"
+      puts "file #{Project.config_dir}/#{config_file.file} created"
     end
 
   end

data/lib/dice_bag/version.rb

@@ -1,3 +1,3 @@
 module DiceBag
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dice_bag
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-14 00:00:00.000000000Z
+date: 2013-02-21 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &73429760 !ruby/object:Gem::Requirement
+  requirement: &74949160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *73429760
+  version_requirements: *74949160
 description: 
 email:
 - asmith@mdsol.com