yamljam 0.0.2 → 0.0.3

data/bin/yamljam

@@ -7,7 +7,7 @@ if !ARGV[0] || ARGV[0] == "--help"
 	puts "Creates a <directory>.yml file containing the keys from all yml files found in <directory>. Does not work recursively yet!"
 else
 	begin
-		Yamljam::Jammer.new.jam(Dir.getwd, ARGV[0])
+		Yamljam::Jammer.new.jam(ARGV[0])
 	rescue Exception => ex
 		puts "failed due to exception: #{ex.class}! message was #{ex.message}"
 	end

data/lib/yamljam.rb

@@ -3,5 +3,5 @@ require "yamljam/version"
 module Yamljam
 	require 'yaml'
 
-	require File.join("yamljam", "concatenator")
+	require File.join("yamljam", "jammer")
 end

data/lib/yamljam/jammer.rb

@@ -0,0 +1,52 @@
+module Yamljam
+  class Jammer
+    def merged_hash
+      @hash ||= {}
+    end
+
+    def write_output(output_hashmap, output_file)
+      begin
+        File.open(output_file, 'w') do |f|
+          f.puts("# Generated by Yamljam. Do not directly edit this file.")
+          f.write(output_hashmap.to_yaml)
+        end
+      rescue Exception => ex # if it's any solace I cringed when I wrote that
+        puts "hit exception when writing output file! #{ex.class} #{ex.message} #{ex.backtrace}"
+        raise ex
+      end
+    end
+
+    def merge_files(input_files, namespace)
+      {namespace => input_files.map{|input_file| make_hashmap(input_file)}.reduce({}, &:merge)}
+    end
+
+    def make_hashmap(input_file)
+      base_hashmap = YAML::load_file(input_file)
+    end
+
+    def jam(input_directory_name)
+      write_output(jam_recursive(input_directory_name), input_directory_name + ".yml")      
+    end
+
+    def jam_recursive(input_directory_name)
+      Dir.chdir(input_directory_name) do
+        directories = Dir.entries('.').reject{|entry| !File.directory?(entry) || entry == '.' || entry == '..'}
+        yaml_files = Dir.entries('.').reject{|entry| File.directory?(entry) || !is_yaml?(entry)}
+        merged_yaml = merge_files(yaml_files, input_directory_name)
+        more_yamls = directories.map{|directory| jam_recursive(directory)}
+        
+        total_merged_yaml = {input_directory_name => more_yamls.reduce(merged_yaml[input_directory_name], &:merge)}
+        return total_merged_yaml
+      end
+    end
+
+    def name_of_dotdot
+      # is there seriously not a better way to do this?
+      Dir.chdir(".."){File.split(Dir.getwd).last}
+    end
+
+    def is_yaml?(filename)
+      %w[yml yaml].include?(filename.split(".").last)
+    end
+  end
+end

data/lib/yamljam/version.rb

@@ -1,3 +1,3 @@
 module Yamljam
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/yamljam.gemspec

@@ -20,6 +20,6 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   # specify any dependencies here; for example:
-  # s.add_development_dependency "rspec"
+  s.add_development_dependency "rspec"
   # s.add_runtime_dependency "rest-client"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: yamljam
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Bill Abney
@@ -15,9 +15,22 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-12 00:00:00 Z
-dependencies: []
-
+date: 2012-06-13 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id001
 description: concatenates multiple yaml files from a subdirectory into one yaml file. Useful for splitting up and re-joining en.yml
 email: 
 - bill.abney@gmail.com
@@ -34,7 +47,7 @@ files:
 - Rakefile
 - bin/yamljam
 - lib/yamljam.rb
-- lib/yamljam/concatenator.rb
+- lib/yamljam/jammer.rb
 - lib/yamljam/version.rb
 - yamljam.gemspec
 homepage: ""

data/lib/yamljam/concatenator.rb

@@ -1,41 +0,0 @@
-module Yamljam
-  class Jammer
-    def concatenate(input_files, output_file)
-      output_hashmap = merge_files(input_files)
-      write_output(output_hashmap, output_file)
-    end
-
-    def write_output(output_hashmap, output_file)
-      begin
-        File.open(output_file, 'w') do |f|
-          f.puts("# Generated by Yamljam. Do not directly edit this file.")
-          f.write(output_hashmap.to_yaml)
-        end
-      rescue Exception => ex # if it's any solace I cringed when I wrote that
-        puts "hit exception when writing output file! #{ex.class} #{ex.message} #{ex.backtrace}"
-        raise ex
-      end
-    end
-
-    def merge_files(input_files)
-      {@namespace => input_files.map{|input_file| make_hashmap(input_file)}.reduce({}, &:merge)}
-    end
-
-    def make_hashmap(input_file)
-      base_hashmap = YAML::load_file(input_file)
-    end
-
-    def jam(input_directory_path, namespace)
-      # input directory will contain #{namespace}.yml (output file, which will be blown away)
-      # and a directory called #{namespace}. All files in the #{namespace} directory will be
-      # assumed to be yaml input files if they end in .yml or .yaml, and ignored otherwise.
-      @namespace = namespace
-      input_directory_path ||= Dir.getwd
-      input_file_dir = File.join(input_directory_path, namespace)
-      Dir.chdir(input_file_dir) do
-        input_files = Dir.glob("*.yaml") + Dir.glob("*.yml")
-        concatenate(input_files, File.join("..", namespace + ".yml"))
-      end
-    end
-  end
-end