yamldiff 0.0.8 → 0.0.9

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 27d91d4a12050a4e55e9ad4ea4da5c11dfb03822
+  data.tar.gz: 36e04acd943bb9203850964de70d3ce89c2bd6b6
+SHA512:
+  metadata.gz: 78d02396e4d39a5392b94ea79314c83f8a3f8a99e3c595234a808154b3e404e6a9f90a7b038f1f711c72aef5aba93ee9a97b3cf6fa3e71cf4de513b60be1eda7
+  data.tar.gz: eee3454912b71aed4e277e9fc18b346a787da143f670c3f5ea23635feb38896103fa2a938b1a2cd1b8c3afc784e33814deab23f15a03ad9b5a4413c2a3c58421

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+*.yml

data/README.md

@@ -1,4 +1,5 @@
 # Yamldiff
+[![Build Status](https://travis-ci.org/wallace/yamldiff.png)](https://travis-ci.org/wallace/yamldiff)
 
 Given two yaml files, Yamldiff tells you which keys present in the first file
 are not present in the second.

data/bin/yamldiff

@@ -0,0 +1,12 @@
+#!/usr/bin/env ruby
+
+$LOAD_PATH.unshift(File.expand_path("../../lib", __FILE__))
+require 'yamldiff'
+
+if ARGV.size != 2
+  $stderr.puts "USAGE: yamldiff file1 file2"
+  exit 1
+end
+
+errors = Yamldiff.diff_yaml(ARGV[0], ARGV[1])
+puts errors[ARGV[1]]

data/lib/yamldiff.rb

@@ -1,4 +1,5 @@
 require 'yaml'
+require 'diffy'
 require "yamldiff/version"
 require "yamldiff/yamldiff_error"
 require "yamldiff/yamldiff"

data/lib/yamldiff/version.rb

@@ -1,3 +1,3 @@
 class Yamldiff
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/lib/yamldiff/yamldiff.rb

@@ -2,8 +2,8 @@ class Yamldiff
   class << self
     # Compare the two yaml files
     def diff_yaml(first, second, errors_for = {})
-      primary            = YAML.load(File.open(first))
-      secondary          = YAML.load(File.open(second))
+      primary            = YAML.load(ERB.new(File.read(first)).result)
+      secondary          = YAML.load(ERB.new(File.read(second)).result)
       errors_for[second] = compare_hashes(primary, secondary)
       errors_for
     end
@@ -20,13 +20,13 @@ class Yamldiff
 
       first.each do |key, value|
         unless second.key?(key)
-          errors << YamldiffKeyError.new(key, context) # "Missing key : #{key} in path #{context.join(".")}"
+          errors << YamldiffKeyError.new(key, context)
           next
         end
 
         value2 = second[key]
         if (value.class != value2.class)
-          errors << YamldiffKeyValueTypeError.new(key, context) # "Key value type mismatch : #{key} in path #{context.join(".")}"
+          errors << YamldiffKeyValueTypeError.new(key, context)
           next
         end
 
@@ -36,7 +36,7 @@ class Yamldiff
         end
 
         if (value != value2)
-          errors << YamldiffKeyValueError.new(key, context) # "Key value mismatch : #{key} in path #{context.join(".")}"
+          errors << YamldiffKeyValueError.new(key, context, Diffy::Diff.new(value.to_s + "\n", value2.to_s + "\n"))
         end
       end
 

data/lib/yamldiff/yamldiff_error.rb

@@ -6,6 +6,31 @@ class YamldiffError
   end
 end
 
-class YamldiffKeyError < YamldiffError; end
-class YamldiffKeyValueTypeError < YamldiffError; end
-class YamldiffKeyValueError < YamldiffError; end
+class YamldiffKeyError < YamldiffError
+  def to_s
+    "Missing key: #{@context.join(".")}.#{@key}"
+  end
+end
+
+class YamldiffKeyValueTypeError < YamldiffError
+  def to_s
+    "Key value type mismatch: #{@context.join(".")}.#{@key}"
+  end
+end
+
+class YamldiffKeyValueError < YamldiffError
+  def initialize(key, context, diff = nil)
+    super key, context
+    @diff = diff
+  end
+
+  def to_s
+    output = []
+    output << "Key content differs: #{@context.join(".")}.#{@key}"
+    if @diff
+      output << "Diff:"
+      output << @diff
+    end
+    output.join("\n")
+  end
+end

data/spec/lib/yamldiff_error_spec.rb

@@ -0,0 +1,31 @@
+require "spec_helper"
+
+describe YamldiffKeyError, "#to_s" do
+  it "outputs human readable text" do
+    YamldiffKeyError.new('key', ['root', 'namespace']).to_s.should == "Missing key: root.namespace.key"
+  end
+end
+
+describe YamldiffKeyValueTypeError, "#to_s" do
+  it "outputs human readable text" do
+    YamldiffKeyValueTypeError.new('key', ['root', 'namespace']).to_s.should == "Key value type mismatch: root.namespace.key"
+  end
+end
+
+describe YamldiffKeyValueError, "#to_s" do
+  it "outputs human readable text" do
+    YamldiffKeyValueError.new('key', ['root', 'namespace']).to_s.should == "Key content differs: root.namespace.key"
+  end
+
+  it "outputs diff if given" do
+    str1 = "foo\n"
+    str2 = "bar\n"
+    diff = Diffy::Diff.new(str1, str2)
+    YamldiffKeyValueError.new('key', ['root', 'namespace'], diff).to_s.should == <<-OUTPUT
+Key content differs: root.namespace.key
+Diff:
+-foo
++bar
+OUTPUT
+  end
+end

data/spec/lib/yamldiff_spec.rb

@@ -117,5 +117,21 @@ describe Yamldiff do
       result[second].first.key.should eql("bar")
       result[second].first.context.should eql(["en", "baz"])
     end
+
+    it "diffs the output when the values are different and passes diff to error" do
+      first  = "./en.yml"
+      second = "./es.yml"
+      File.open(first, "w") do |f|
+        f.puts("en: ")
+        f.puts("  app_name: 'Verbosefish'")
+      end
+      File.open(second, "w") do |f|
+        f.puts("en: ")
+        f.puts("  app_name: 'Verboszefish'")
+      end
+      Diffy::Diff.expects(:new).with("Verbosefish\n", "Verboszefish\n").returns("DIFF")
+      YamldiffKeyValueError.expects(:new).with('app_name', ['en'], 'DIFF')
+      result = subject.diff_yaml(first, second)
+    end
   end
 end

data/yamldiff.gemspec

@@ -14,6 +14,7 @@ Gem::Specification.new do |gem|
   gem.name          = "yamldiff"
   gem.require_paths = ["lib"]
   gem.version       = Yamldiff::VERSION
+  gem.add_dependency 'diffy'
   gem.add_development_dependency 'fakefs'
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec'

metadata

@@ -1,93 +1,119 @@
 --- !ruby/object:Gem::Specification
 name: yamldiff
 version: !ruby/object:Gem::Version
-  version: 0.0.8
-  prerelease: 
+  version: 0.0.9
 platform: ruby
 authors:
 - Jonathan R. Wallace
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-23 00:00:00.000000000 Z
+date: 2014-04-25 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: diffy
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &70324675319160 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70324675319160
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70324675327180 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70324675327180
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70324675324520 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70324675324520
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Shows the difference yaml keys
 email:
 - jonathan.wallace@gmail.com
-executables: []
+executables:
+- yamldiff
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
+- bin/yamldiff
 - lib/yamldiff.rb
 - lib/yamldiff/version.rb
 - lib/yamldiff/yamldiff.rb
 - lib/yamldiff/yamldiff_error.rb
+- spec/lib/yamldiff_error_spec.rb
 - spec/lib/yamldiff_spec.rb
 - spec/spec_helper.rb
 - yamldiff.gemspec
 homepage: ''
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Yamldiff will tell you when and where you have differences between two yaml
   files.  It prints out a list of missing keys for the second file.
 test_files:
+- spec/lib/yamldiff_error_spec.rb
 - spec/lib/yamldiff_spec.rb
 - spec/spec_helper.rb