ytools 0.2.4 → 0.3.0

data/Gemfile

@@ -1,10 +1,7 @@
-source :rubygems
-
-gem 'choosy', '~> 0.2.4'
 
-group :development do
-  gem 'rspec', :require => "spec"
-  gem 'autotest'
-  gem 'autotest-notification'
-end
+require 'rubygems'
+require 'choosy'
+require 'rake'
 
+source :rubygems
+gemspec

data/Gemfile.lock

@@ -1,3 +1,9 @@
+PATH
+  remote: .
+  specs:
+    ytools (0.2.1)
+      choosy (>= 0.4.3)
+
 GEM
   remote: http://rubygems.org/
   specs:
@@ -6,7 +12,7 @@ GEM
       ZenTest (>= 4.4.1)
     autotest-notification (2.3.1)
       autotest (~> 4.3)
-    choosy (0.2.5)
+    choosy (0.4.3)
     diff-lcs (1.1.2)
     rspec (2.5.0)
       rspec-core (~> 2.5.0)
@@ -21,7 +27,8 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  ZenTest
   autotest
   autotest-notification
-  choosy (~> 0.2.4)
   rspec
+  ytools!

data/Rakefile

@@ -1,49 +1,17 @@
-$LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
-$LOAD_PATH.unshift File.expand_path("../spec", __FILE__)
+#$LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
+#$LOAD_PATH.unshift File.expand_path("../spec", __FILE__)
 
+require 'rubygems'
 require 'fileutils'
 require 'rake'
-require 'rubygems'
 require 'rspec/core/rake_task'
-require 'ytools/version'
+require 'choosy/version'
+require 'choosy/rake'
 
 task :default => :spec
 
 desc "Run the RSpec tests"
 RSpec::Core::RakeTask.new
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name           = 'ytools'
-    gem.version        = YTools::Version.to_s
-    gem.executables    = %W{ypath ytemplates}
-    gem.summary        = 'For reading or writing configuration files using YAML.'
-    gem.description    = "Installs the ypath tool for reading YAML files using an XPath-like syntax.  Installs the ytemplates tool for writing ERB templates using YAML files as the template binding object."
-    gem.email          = ['madeonamac@gmail.com']
-    gem.authors        = ['Gabe McArthur']
-    gem.homepage       = 'http://github.com/gabemc/ytools'
-    gem.files          = FileList["[A-Z]*", "{bin,lib,spec}/**/*"]
-    
-    gem.add_dependency             'choosy', '>=0.2.5'
-    gem.add_development_dependency 'rspec', '>=2.5.0'
-  end
-rescue LoadError
-  puts "Jeweler or dependencies are not available.  Install it with: sudo gem install jeweler"
-end
-
-desc "Deploys the gem to rubygems.org"
-task :gem => :release do
-  system("gem build ytools.gemspec")
-  system("gem push ytools-#{YTools::Version.to_s}.gem")
-end
-
-desc "Does the full release cycle."
-task :deploy => [:gem, :clean] do
-end
-
 desc "Cleans the gem files up."
-task :clean do
-  FileUtils.rm(Dir.glob('*.gemspec'))
-  FileUtils.rm(Dir.glob('*.gem'))
-end
+task :clean => ['gem:clean']

data/lib/VERSION.yml

@@ -0,0 +1,6 @@
+--- 
+version: 
+  major: 0
+  minor: 3
+  tiny: 0
+date: 30/03/2011

data/lib/ytools/basecli.rb

@@ -1,6 +1,6 @@
 require 'ytools/errors'
 require 'ytools/utils'
-require 'ytools/version'
+require 'choosy'
 
 module YTools
   class BaseCLI
@@ -33,7 +33,7 @@ module YTools
           end
         end
         boolean_ :debug, "Prints out the merged YAML as a ruby object to STDERR."
-        version YTools::Version
+        version Choosy::Version.new(File.join(File.dirname(__FILE__), '..', 'VERSION.yml'))
         help
         
         arguments do

data/lib/ytools/path/cli.rb

@@ -11,11 +11,11 @@ module YTools::Path
         printer :standard, :max_width => 80
         executor Executor.new
 
-        header 'Description:'
+        heading 'Description:'
         para "This tool uses a kind of XPath syntax for locating and printing elements from within YAML files.  Check out the '--examples' flag for details on the exact path syntax."
         para "It accepts multiple yaml files, and will merge their contents in the order in which they are given.  Thus, files listed later, if their keys conflict with ones listed earlier, override the earlier listed values.  If you pass in files that don't exist, no error will be  raised unless the '--strict' flag is passed."
 
-        header 'Option:'
+        heading 'Option:'
         string :path, "The YAML Path pattern syntax to run against the input." do
           required
           depends_on :examples

data/lib/ytools/templates/cli.rb

@@ -11,13 +11,13 @@ module YTools::Templates
         executor Executor.new
         printer :standard, :max_width => 80
 
-        header 'Description:'
+        heading 'Description:'
         para 'This tool uses an ERB template file and a set of YAML files to generate a merged file.  For convenience, all of the keys in hashes in regular YAML can work like methods in the ERB templates. Thus, the YAML "{ \'a\' : {\'b\' : 3 } }" could be used in an ERB template with "<%= a.b %>" instead of the more verbose hash syntax.  Indeed, the root hash values can only be accessed by those method attributes, because the root YAML context object is simply assumed.'
         para "It accepts multiple yaml files, and will merge their contents in the order in which they are given.  Thus, files listed later, if their keys conflict with ones listed earlier, override the earlier listed values.  If you pass in files that don't exist, no error will be raised unless the '--strict' flag is passed."
         para "Instead of reading from the template, you can also supply an expression to evaluate from the command line."
         para "Check out the '--examples' flag for more details."
 
-        header 'Options:'
+        heading 'Options:'
         string :template, "The ERB template file to use for generation" do
           depends_on :examples
 

data/lib/ytools/utils.rb

@@ -1,6 +1,5 @@
 require 'optparse'
 require 'ytools/errors'
-require 'ytools/version'
 
 module YTools
   module Utils
@@ -17,7 +16,7 @@ module YTools
     def self.stdin?
       begin
         require 'fcntl'
-        STDIN.fcntl(Fcntl::F_GETFL, 0) == 0 && $stdin.tty?
+        STDIN.fcntl(Fcntl::F_GETFL, 0) == 0  && !$stdin.tty?
       rescue
         $stdin.stat.size != 0
       end

metadata

@@ -1,197 +1,140 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ytools
-version: !ruby/object:Gem::Version 
-  hash: 31
+version: !ruby/object:Gem::Version
+  version: 0.3.0
   prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 4
-  version: 0.2.4
 platform: ruby
-authors: 
+authors:
 - Gabe McArthur
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-03-17 00:00:00 -07:00
+date: 2011-03-30 00:00:00.000000000 -07:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: choosy
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &74253030 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 0
-        - 2
-        - 4
-        version: 0.2.4
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.4.3
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *74253030
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &74252610 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: autotest
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *74252610
+- !ruby/object:Gem::Dependency
+  name: autotest
+  requirement: &74251990 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: autotest-notification
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *74251990
+- !ruby/object:Gem::Dependency
+  name: autotest-notification
+  requirement: &74251490 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: choosy
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *74251490
+- !ruby/object:Gem::Dependency
+  name: ZenTest
+  requirement: &74251110 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 0
-        - 2
-        - 5
-        version: 0.2.5
-  type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rspec
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 2
-        - 5
-        - 0
-        version: 2.5.0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-description: Installs the ypath tool for reading YAML files using an XPath-like syntax.  Installs the ytemplates tool for writing ERB templates using YAML files as the template binding object.
-email: 
+  prerelease: false
+  version_requirements: *74251110
+description: Installs the ypath tool for reading YAML files using an XPath-like syntax.
+  Installs the ytemplates tool for turning YAML-based configuration files into other
+  files using erb temlates.
+email:
 - madeonamac@gmail.com
-executables: 
+executables:
 - ypath
 - ytemplates
 extensions: []
-
-extra_rdoc_files: 
-- README.markdown
-files: 
+extra_rdoc_files: []
+files:
+- Rakefile
 - Gemfile
-- Gemfile.lock
 - README.markdown
-- Rakefile
-- bin/ypath
+- Gemfile.lock
 - bin/ytemplates
-- lib/VERSION
-- lib/ytools/basecli.rb
-- lib/ytools/errors.rb
-- lib/ytools/path/cli.rb
-- lib/ytools/path/examples.txt
-- lib/ytools/path/executor.rb
+- bin/ypath
+- lib/VERSION.yml
+- lib/ytools/utils.rb
+- lib/ytools/yaml_object.rb
 - lib/ytools/path/lexer.rb
 - lib/ytools/path/parser.rb
 - lib/ytools/path/selectors.rb
+- lib/ytools/path/cli.rb
+- lib/ytools/path/executor.rb
+- lib/ytools/path/examples.txt
+- lib/ytools/templates/yaml_object.rb
 - lib/ytools/templates/cli.rb
-- lib/ytools/templates/examples.txt
 - lib/ytools/templates/executor.rb
-- lib/ytools/templates/yaml_object.rb
-- lib/ytools/utils.rb
-- lib/ytools/version.rb
-- lib/ytools/yaml_object.rb
+- lib/ytools/templates/examples.txt
+- lib/ytools/errors.rb
 - lib/ytools/yreader.rb
-- spec/helpers.rb
+- lib/ytools/basecli.rb
 - spec/path/executor_spec.rb
-- spec/path/lexer_spec.rb
-- spec/path/parser_spec.rb
 - spec/path/selectors_spec.rb
+- spec/path/lexer_spec.rb
+- spec/path/yamls/6.yml
 - spec/path/yamls/1.yml
+- spec/path/yamls/5.yml
+- spec/path/yamls/4.yml
 - spec/path/yamls/2.yml
 - spec/path/yamls/3.yml
-- spec/path/yamls/4.yml
-- spec/path/yamls/5.yml
-- spec/path/yamls/6.yml
+- spec/path/parser_spec.rb
 - spec/yaml_object_spec.rb
+- spec/helpers.rb
 has_rdoc: true
 homepage: http://github.com/gabemc/ytools
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: 1.3.6
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.6.1
 signing_key: 
 specification_version: 3
-summary: For reading or writing configuration files using YAML.
-test_files: 
-- spec/helpers.rb
-- spec/path/executor_spec.rb
-- spec/path/lexer_spec.rb
-- spec/path/parser_spec.rb
-- spec/path/selectors_spec.rb
-- spec/yaml_object_spec.rb
+summary: For reading or writing configuration files using yaml.
+test_files: []

data/lib/VERSION

@@ -1 +0,0 @@
-0.2.4

data/lib/ytools/version.rb

@@ -1,12 +0,0 @@
-require 'scanf'
-
-module YTools
-  class Version
-    CURRENT = File.read(File.dirname(__FILE__) + '/../VERSION')
-    MAJOR, MINOR, TINY = CURRENT.scanf('%d.%d.%d')
-
-    def self.to_s
-      CURRENT
-    end
-  end
-end