outline 0.1.5 → 0.2.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    outline (0.1.3)
+    outline (0.2.0)
       meta_tools (~> 0.2.6)
 
 GEM

data/Rakefile

@@ -0,0 +1,49 @@
+require 'pathname'
+__LIB__ = Pathname.new(__FILE__).expand_path.dirname.join('lib').to_s
+$:.unshift(__LIB__) unless $:.include?(__LIB__)
+require 'outline'
+
+def notify(message)
+  start_time = Time.now
+  puts "-- #{message}"
+  yield
+  puts "   -> #{'%0.04f' % (Time.now - start_time)}s"
+end
+
+namespace :gem do
+  desc 'Update the VERSION file to the latest version'
+  task :update_version do
+    notify 'Updating VERSION' do
+      File.open('VERSION', 'w+') { |f| f.print Outline::VERSION }
+    end
+  end
+  
+  desc 'Build the gem'
+  task :build do
+    notify 'Building gem' do
+      `gem build *.gemspec`
+    end
+  end
+  
+  desc 'Push the gem to RubyGems'
+  task :push do
+    notify 'Pushing gem' do
+      `gem push *.gem`
+    end
+  end
+  
+  desc 'Move the gem to the pkg directory'
+  task :move do
+    notify 'Moving gem' do
+      `mv *.gem pkg/`
+    end
+  end
+  
+  desc 'Update VERSION, build the gem, push the gem, then move the gem to the pkg directory'
+  task deploy: [:update_version, :build, :push, :move]
+end
+
+desc "Run all specs"
+task :spec do
+  sh 'bundle exec rspec spec'
+end

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.2.0

data/lib/outline.rb

@@ -3,114 +3,93 @@ require 'meta_tools'
 
 class Hash
   def to_outline
+    convert_data = Proc.new do |data|
+      data.each_with_object({}) do |(key, value), memo|
+        if value.respond_to?(:to_hash) || value.respond_to?(:to_h)
+          value = value.respond_to?(:to_hash) ? value.to_hash : value.to_h
+          value = value.to_outline
+        end
+        
+        memo[key] = value
+      end
+    end
+    
+    data = convert_data[ self ]
     
+    Outline.new(data: data)
   end
 end
 
 class Outline
-  undef_method :abort
-  undef_method :at_exit
-  undef_method :autoload
-  undef_method :autoload?
-  undef_method :binding
-  undef_method :caller
-  undef_method :catch
-  undef_method :exit
-  undef_method :exit!
-  undef_method :fail
-  undef_method :fork
-  undef_method :format
-  undef_method :gets
-  undef_method :global_variables
-  undef_method :loop
-  undef_method :open
-  undef_method :p
-  undef_method :print
-  undef_method :printf
-  undef_method :raise
-  undef_method :rand
-  undef_method :readline
-  undef_method :readlines
-  undef_method :require
-  undef_method :require_relative
-  undef_method :select
-  undef_method :set_trace_func
-  undef_method :sleep
-  undef_method :spawn
-  undef_method :sprintf
-  undef_method :srand
-  undef_method :syscall
-  undef_method :system
-  undef_method :test
-  undef_method :throw
-  undef_method :trace_var
-  undef_method :trap
-  undef_method :untrace_var
-  undef_method :warn
-  
-  class ArgumentWithBlockError < StandardError
-    def to_s; "You cannot give an argument with a block"; end
-  end
+  VERSION = '0.2.0'
   
+  # It's as if we are subclassing BasicObject, but without the loss of context (and object_id):
+  (Object.instance_methods - BasicObject.instance_methods).each { |meth| remove_method(meth) unless [:object_id].include?(meth) rescue nil }
   include MetaTools
   
   attr_reader :parent, :data
   
   def initialize(opts={}, &blk)
     raise(TypeError, "opts must respond to :to_hash or be nil") unless opts.nil? || opts.respond_to?(:to_hash)
-    raise(TypeError, "opts[:data] must respond to :to_h or :to_hash or be nil") unless opts.nil? || opts.respond_to?(:to_hash) || opts.respond_to?(:to_h)
+    raise(TypeError, "opts[:data] must respond to :to_h or :to_hash or be nil") unless opts[:data].nil? || opts[:data].respond_to?(:to_hash) || opts[:data].respond_to?(:to_h)
     
     opts = opts.to_hash
-    
-    # Check to see if incoming data is already an outline
-    # if so, then turn it into a hash
-    
     data = opts[:data].respond_to?(:to_hash) ? opts[:data].to_hash : opts[:data].to_h unless opts[:data].nil?
     
     @parent = opts[:parent]
     @data = data
-    @data ||= {}
+    @methods = []
     
-    instance_eval(&blk) if block_given?
+    instance_eval(&blk) unless blk.nil?
   end
   
   def method_missing(meth, *args, &blk)
     meth = meth.to_s.gsub(/=$/, '').to_sym if meth =~ /=$/
     
-    meta_def(meth) do |value=nil, &blk|
-      block_given, value_given = !blk.nil?, !value.nil?
+    unless @methods.include?(meth)
+      @methods << meth
       
-      if !block_given && !value_given
-        @data[meth] = Outline.new(parent: self) unless @data.has_key?(meth)
+      meta_def(meth) do |*values, &blk|
+        block_given, values_given = !blk.nil?, !values.empty?
+        @data ||= {}
         
-        @data[meth]
-      elsif block_given && value_given
-        raise ArgumentWithBlockError
-      elsif !block_given && value_given
-        @data[meth] = value
-      elsif block_given && !value_given
-        @data[meth] = Outline.new(parent: self, &blk)
+        if !block_given && !values_given
+          @data[meth] = Outline.new(parent: self) unless @data.has_key?(meth)
+          
+          @data[meth]
+        elsif block_given && values_given
+          data = values.delete_at(-1) if values.last.respond_to?(:to_hash) || values.last.respond_to?(:to_h)
+          data = { value: values.length == 1 ? values.first : values }.merge!(data || {})
+          
+          @data[meth] = Outline.new(parent: self, data: data, &blk)
+        elsif !block_given && values_given
+          data = values.delete_at(-1) if values.last.respond_to?(:to_hash) || values.last.respond_to?(:to_h)
+          
+          if data.nil?
+            @data[meth] = values.length == 1 ? values.first : values
+          else
+            data = { value: values.length == 1 ? values.first : values }.merge!(data || {}) unless values.empty?
+            
+            @data[meth] = Outline.new(parent: self, data: data)
+          end
+        elsif block_given && !values_given
+          @data[meth] = Outline.new(parent: self, &blk)
+        end
       end
       
-    end unless methods.include?(meth)
-    
-    meta_def("#{meth}=") { |value| send(meth, value) }
+      meta_def("#{meth}=") { |value| __send__(meth, value) }
+    end
     
-    send(meth, *args, &blk)
+    __send__(meth, *args, &blk)
   end
   
   def to_h
-    @data.inject({}) do |memo, (key, value)|
-      memo[key] = value#.respond_to?(:to_h) ? value.to_h : value
-      memo
+    @data ||= {}
+    @data.each_with_object({}) do |(key, value), memo|
+      memo[key] = value.respond_to?(:to_h) ? value.to_h : value
     end
   end
   
-  def inspect
-    "#<Outline:0x#{self.object_id.to_s(16)} @data=#{to_h}>"
-    # "{O}#{to_h}"
-  end
-  
   # def to_json; end
   # def to_xml; end
   # def to_yaml; end

data/spec/outline_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'outline'
 
 describe Outline do
   let(:config) do
@@ -12,23 +12,42 @@ describe Outline do
         remote "origin"
       end
       
-      commands do
+      multiple 'foo', 'bar', 'baz'
+      
+      commands say_hello: "echo 'Why, hello there'" do
         ssh "ssh deployer@#{parent.web.server}"
+        
+        deploy Proc.new { "deploy completed" }
+        command :foo do
+          bar 'bar'
+        end
+        
+        wget opts: '-a -b -c'
       end
       
-      toggle
       some.deep.indented.config 'foo'
     end
   end
   
+  describe 'VERSION' do
+    it "should be correct" do
+      Outline::VERSION.should == '0.2.0'
+    end
+  end
+  
   describe "getters" do
     it "should work" do
       config.testing.should == "testing"
       config.foo.should == "foo"
       proc { config.foo = "bar" }.call.should == "bar"
       config.timestamp_format.should == "%Y%m%d%H%M%S"
+      config.multiple.should == ['foo', 'bar', 'baz']
       config.some.deep.indented.config.should == 'foo'
     end
+    
+    it 'should contain the correct methods' do
+      config.instance_eval { @methods }.should == [:foo, :timestamp_format, :web, :multiple, :commands, :some]
+    end
   end
   
   describe "#web" do
@@ -46,9 +65,14 @@ describe Outline do
     subject { config.commands }
     it { should be_a(Outline) }
     
-    describe "#ssh" do
-      subject { config.commands.ssh }
-      it { should == "ssh deployer@my-proj.com" }
+    it "should return the correct values" do
+      config.commands.say_hello.should == "echo 'Why, hello there'"
+      config.commands.ssh.should == "ssh deployer@my-proj.com"
+      config.commands.deploy.class.should == Proc
+      config.commands.deploy.call.should == "deploy completed"
+      config.commands.command.value.should == :foo
+      config.commands.command.bar.should == 'bar'
+      config.commands.wget.opts.should == '-a -b -c'
     end
   end
   
@@ -62,28 +86,30 @@ describe Outline do
   end
   
   describe "#to_h" do
-    # it "should return the correct Hash output" do
-    #   config.to_h.should == {
-    #     :testing => 'testing',
-    #     :foo => 'foo',
-    #     :timestamp_format => "%Y%m%d%H%M%S",
-    #     :web => {
-    #       :server => "my-proj.com",
-    #       :branch => "master",
-    #       :remote => "origin"
-    #     },
-    #     :commands => {
-    #       :ssh => "ssh deployer@my-proj.com"
-    #     },
-    #     :some => {
-    #       :deep => {
-    #         :indented => {
-    #           :config => 'foo'
-    #         }
-    #       }
-    #     }
-    #   }
-    # end
+    it "should return the correct Hash output" do
+      config.to_h[:testing].should == "testing"
+      config.to_h[:foo].should == "foo"
+      config.to_h[:timestamp_format].should == "%Y%m%d%H%M%S"
+      config.to_h[:web].should == { server: "my-proj.com", branch: "master", remote: "origin" }
+      config.to_h[:multiple].should == ["foo", "bar", "baz"]
+      config.to_h[:commands].should be_a(Hash)
+      config.to_h[:commands][:say_hello].should == "echo 'Why, hello there'"
+      config.to_h[:commands][:ssh].should == "ssh deployer@my-proj.com"
+      config.to_h[:commands][:deploy].should be_a(Proc)
+      config.to_h[:commands][:command].should == { value: :foo, bar: "bar" }
+      config.to_h[:commands][:wget].should == { opts: "-a -b -c" }
+      config.to_h[:some][:deep][:indented][:config].should == "foo"
+    end
   end
   
+end
+
+describe "Hash conversion" do
+  it "properly convert into a Hash" do
+    outline = { a: 'a', b: 'b', some: { deep: { indented: { config: 'foo' } } } }.to_outline
+    
+    outline.a.should == 'a'
+    outline.b.should == 'b'
+    outline.some.deep.indented.config.should == 'foo'
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: outline
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-26 00:00:00.000000000Z
+date: 2012-04-10 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: meta_tools
-  requirement: &70222087778620 !ruby/object:Gem::Requirement
+  requirement: &70269583507100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *70222087778620
+  version_requirements: *70269583507100
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70222087778140 !ruby/object:Gem::Requirement
+  requirement: &70269583506500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70222087778140
+  version_requirements: *70269583506500
 description: Easily set configurations on your Ruby apps.
 email: c00lryguy@gmail.com
 executables: []
@@ -41,10 +41,10 @@ extra_rdoc_files:
 - VERSION
 files:
 - VERSION
+- Rakefile
 - Gemfile.lock
 - lib/outline.rb
 - spec/outline_spec.rb
-- spec/spec_helper.rb
 homepage: http://github.com/c00lryguy/outline
 licenses: []
 post_install_message: 
@@ -57,12 +57,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3261779845905764895
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3261779845905764895
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10
@@ -71,5 +77,3 @@ specification_version: 3
 summary: Simplify your configurations.
 test_files:
 - spec/outline_spec.rb
-- spec/spec_helper.rb
-has_rdoc: 

data/spec/spec_helper.rb

@@ -1,3 +0,0 @@
-require 'outline'
-
-system('clear')