figs 1.2.2 → 1.2.3

data/lib/figs/application.rb

@@ -4,6 +4,7 @@ require "yaml"
 require "figs/error"
 require "figs/env"
 require "figs/git_handler"
+require "figs/directory_flattener"
 
 module Figs
   class Application
@@ -23,11 +24,15 @@ module Figs
       figfile["locations"]
     end
     
+    def flattened_filenames(filenames)
+      Figs::DirectoryFlattener.flattened_filenames(filenames)
+    end
+    
     def load_path
       if figfile["method"].eql? "git"
-        @path = path_from_git(figfile["repo"], figfile["locations"])
+        @path = path_from_git(figfile["repo"], flattened_filenames(figfile["locations"]))
       else
-        @path = figfile["locations"]
+        @path = flattened_filenames(figfile["locations"])
       end
     end
     

data/lib/figs/directory_flattener.rb

@@ -0,0 +1,19 @@
+module Figs
+  module DirectoryFlattener
+    extend self
+    def flattened_filenames filenames
+      return filenames if !filenames.is_a?(Array)
+      names = []
+      filenames.each do |filename|
+        Dir.exists?(filename) ? names << directory_to_filenames(filename) : names << filename
+      end
+      names.flatten
+    end
+    private
+    def directory_to_filenames file
+      arr = []
+      Dir.exists?(file) ? Dir.foreach(file) {|s| arr << directory_to_filenames("#{file}/#{s}") unless (s =='.' || s == '..')} : arr << file if File.exists?(file)
+      arr
+    end
+  end
+end

data/lib/figs/env.rb

@@ -1,4 +1,3 @@
-require 'hashie'
 module Figs
   module ENV
     extend self

data/lib/figs/git_handler.rb

@@ -1,5 +1,6 @@
 require "git"
 
+require "figs/directory_flattener"
 module Figs
   module GitHandler
     extend self
@@ -8,7 +9,7 @@ module Figs
     def location(gitpath, filenames)
       @temp_files = []
       git_clone gitpath
-      temp_filenames(([]<< filenames).flatten)
+      temp_filenames(([]<< Figs::DirectoryFlattener.flattened_filenames(filenames.collect {|filename| "#{TMP_GIT_DIR}#{filename}"})).flatten)
     rescue Exception => e
       p e
       clear_tmp_dir
@@ -32,7 +33,7 @@ module Figs
     def copy_to_temp_files(filename)
       temp_file = Tempfile.new("#{filename.gsub('/','-')}")
       temp_file.open
-      temp_file.write(File.open("#{TMP_GIT_DIR}#{filename}").read)
+      temp_file.write(File.open("#{filename}").read)
       temp_file.flush
       @temp_files << temp_file
       temp_file.path

data/lib/figs/tasks/install.rake

@@ -23,7 +23,7 @@ end
 
 def create_non_existent_yaml(locations)
   locations.each do |file|
-    if !File.exists?(file)
+    if !File.exists?(file) && !Dir.exists?(file)
       puts "[Add] #{file} does not exist, creating."
       application_yml = File.expand_path("../../templates/application.yml", __FILE__)
       File.open(file, 'w+') do |f|

data/lib/figs/version.rb

@@ -1,3 +1,3 @@
 module Figs
-  VERSION = "1.2.2"
+  VERSION = "1.2.3"
 end

data/lib/figs.rb

@@ -1,6 +1,7 @@
 require "figs/application"
 require "figs/env"
 require "figs/figfile"
+require "figs/directory_flattener"
 
 module Figs
   extend self

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: figs
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -27,22 +27,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '10.1'
-- !ruby/object:Gem::Dependency
-  name: hashie
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.0.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.0.5
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
@@ -67,6 +51,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/figs/application.rb
+- lib/figs/directory_flattener.rb
 - lib/figs/env.rb
 - lib/figs/error.rb
 - lib/figs/figfile.rb
@@ -95,7 +80,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -228231686379995656
+      hash: 4152814583514099244
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -104,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -228231686379995656
+      hash: 4152814583514099244
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23