peony 0.1.9 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1492230290741387a061c5d15991153d1e34a941
-  data.tar.gz: d4c7c7e712b4b07baade1c490b83dc82b80fcc01
+  metadata.gz: 75ca157cacb14e3f93c07490a459ff987702e7ae
+  data.tar.gz: 536925e87d651896aa033bf630680186ca7cf172
 SHA512:
-  metadata.gz: 87525609921382cf54f35d0451da35f5d89d930d6ed64b5805458d113fac1d63338344c8b6827e4cf3c884a2d34183deba64f427c8ccc5d97dc53063ac152ca6
-  data.tar.gz: d1a6c10b76b0e8a08ce90c9a2fea3901b81146f19e8a8b5b6746960be1e93924db2158edc02f34fc7fa3a2c791cd76566b1694bd7ada38574b6be7823f07a55d
+  metadata.gz: bb13520d6d2cc97c72fac43cf7cef282bd8384dfc77df789f1ab4200b3c8514b3998f595bbb3efa2c95dc4257cd0629fc7e910afe32d83697f3adc5e22d01411
+  data.tar.gz: e93e4fa4c5e4e6dbc02baef82e6cb5a5a1a5bc1f52bc390f11ccd5a7d4670e5f5eb8d92960b4da08328bc799788b540c2fc3cac18906d48daad5d3c4a6e8a4d7

data/bin/peony

@@ -36,8 +36,8 @@ Rake.application.instance_eval do
     require 'peony/rake'
     
     load_rakefile
-    
-    Dir.glob(File.expand_path('../recipes/**/*.rake', __dir__)) do|fn|
+
+    Dir.glob(File.expand_path('../recipes/**/*.rake', __dir__)).reverse.each do|fn|
       load fn
     end
     

data/lib/peony/actions.rb

@@ -1,31 +1,77 @@
 module Peony
   module Actions
 
-    def destination_root
+    def destination_stack
       @destination_stack ||= [File.expand_path(Dir.pwd || '')]
-      @destination_stack.last
+    end
+
+    def destination_root
+      destination_stack.last
     end
 
     # Returns the given path relative to the absolute root (ie, root where
     # the script started).
     #
-    def relative_to_original_destination_root(path, remove_dot = true)
+    def original_destination_root(path, remove_dot = true)
       path = path.dup
-      if path.gsub!(@destination_stack[0], '.')
+      if path.gsub!(destination_stack[0], '.')
         remove_dot ? (path[2..-1] || '') : path
       else
         path
       end
     end
 
+
+    def parse_args
+      ARGV.each do |arg|
+        set $1.strip.to_sym, $2 if arg =~ /([^=]+)=(.+)/
+      end
+    end
+
+    def template(from, to, override=false, sudo=false)
+      template = find_templates(from).first
+      raise "Can't find tempalte #{from} in directory #{template_paths}." unless template
+      raise "File #{to} have already exists." if !override && File.exists?(to)
+      say "copy #{template} to #{to}", :green
+
+      target = sudo ? "/tmp/peony-#{rand(10000)}" : to
+      open(target, 'w+') do |out|
+        out.write(erb(template))
+      end
+      sudo "mv #{tmp} #{to}" if sudo
+    end
+
+    # ### erb
+    # Evaluates an ERB block in the current scope and returns a string.
+    #
+    #     a = 1
+    #     b = 2
+    #
+    #     # Assuming foo.erb is <%= a %> and <%= b %>
+    #     puts erb('foo.erb')
+    #
+    #     #=> "1 and 2"
+    #
+    # Returns the output string of the ERB template.
+    def erb(file, b=binding)
+      require 'erb'
+      ERB.new(File.read(file), nil, '-').result(b)
+    end
+
+
     def mkdir_p(*dirs)
-      dirs.each do|dir|
+      dirs.each do |dir|
         say "mkdir #{dir}", :yellow, true
         FileUtils.mkdir_p(dir) if !FileTest.exists?(dir)
         fail "#{dir} must be a directory!" unless FileTest.directory?(dir)
       end
     end
 
+    def touch(*files)
+      say "touch #{files}", :yellow, true
+      FileUtils.touch(files)
+    end
+
     def sudo(cmd)
       run "sudo #{cmd}"
     end
@@ -88,11 +134,11 @@ module Peony
       dry_run = ENV['dry-run']
 
       say_status :inside, dir, verbose
-      self.padding_up if verbose
-      @destination_stack.push File.expand_path(dir, destination_root)
+      self.padding.up if verbose
+      destination_stack.push File.expand_path(dir, destination_root)
 
       # If the directory doesnt exist and we're not pretending
-      if !File.exist?(destination_root) && !pretend
+      if !File.exist?(destination_root) && !dry_run
         FileUtils.mkdir_p(destination_root)
       end
 
@@ -103,17 +149,17 @@ module Peony
         FileUtils.cd(destination_root) { block.arity == 1 ? yield(destination_root) : yield }
       end
 
-      @destination_stack.pop
-      self.padding_down if verbose
+      destination_stack.pop
+      self.padding.down if verbose
     end
 
 
     # Goes to the root and execute the given block.
     #
     def in_root
-      inside(@destination_stack.first) { yield }
+      inside(destination_stack.first) { yield }
     end
-    
+
     # Loads an external file and execute it in the instance binding.
     #
     # ==== Parameters
@@ -128,22 +174,22 @@ module Peony
     #
     def apply(path, config={})
       verbose = config.fetch(:verbose, true)
-      is_uri  = path =~ /^https?\:\/\//
-      path    = find_recipes(path).first unless is_uri
+      is_uri = path =~ /^https?\:\/\//
+      path = find_recipes(path).first unless is_uri
 
       say_status :apply, path, verbose
-      self.padding_up if verbose
+      self.padding.up if verbose
 
       if is_uri
-        contents = open(path, 'Accept' => 'application/x-peony-template') {|io| io.read }
+        contents = open(path, 'Accept' => 'application/x-peony-template') { |io| io.read }
       else
-        contents = open(path) {|io| io.read }
+        contents = open(path) { |io| io.read }
       end
 
       instance_eval(contents, path)
-      self.padding_down if verbose
+      self.padding.down if verbose
     end
-    
+
     # Executes a command returning the contents of the command.
     #
     # ==== Parameters
@@ -158,7 +204,7 @@ module Peony
     #   end
     #
     def run(command, config={})
-      destination = relative_to_original_destination_root(destination_root, false)
+      destination = original_destination_root(destination_root, false)
       desc = "#{command} from #{destination.inspect}"
 
       if config[:with]

data/lib/peony/{utils.rb → configure.rb}

@@ -1,38 +1,5 @@
 module Peony
-  module Utils
-    
-    def parse_args
-      ARGV.each do|arg|
-        set $1.strip.to_sym, $2 if arg =~ /([^=]+)=(.+)/
-      end
-    end
-
-    def template(from, to, override=false)
-      template = find_templates(from).first
-      raise "Can't find tempalte #{from} in directory #{search_paths}." unless template
-      raise "File #{to} have already exists." if !override && File.exists?(to)
-      say "copy #{template} to #{to}", :green
-      open(to, "w+") do|out|
-        out.write(erb(template))
-      end
-    end
-
-    # ### erb
-    # Evaluates an ERB block in the current scope and returns a string.
-    #
-    #     a = 1
-    #     b = 2
-    #
-    #     # Assuming foo.erb is <%= a %> and <%= b %>
-    #     puts erb('foo.erb')
-    #
-    #     #=> "1 and 2"
-    #
-    # Returns the output string of the ERB template.
-    def erb(file, b=binding)
-      require 'erb'
-      ERB.new(File.read(file), nil, '-').result(b)
-    end
+  module Configure
 
     # ### set
     # Sets settings.
@@ -42,7 +9,7 @@ module Peony
     #
     #     set :domain, 'kickflip.me'
     def set(key, *args, &block)
-      settings.send :"#{key}=", *args, block
+      settings.send :"#{key}=", *args, &block
     end
 
     # ### set_default
@@ -59,7 +26,7 @@ module Peony
     #     set_default :term_mode, :pretty
     #     settings.term_mode.should == :system
     def set_default(key, *args, &block)
-      set(key, *args, block) unless settings.send(:"#{key}?")
+      set(key, *args, block) unless settings.send(:local?, key.to_sym)
     end
 
     # ### settings
@@ -73,6 +40,12 @@ module Peony
       @settings ||= Settings.new
     end
 
+    def scope(name)
+      settings.with_scope(name.to_sym) do
+        yield
+      end
+    end
+
     def template_paths
       ["#{Dir.pwd}/templates", File.expand_path('../../templates', __dir__)]
     end
@@ -92,7 +65,7 @@ module Peony
     def find_in_directories(paths, name, file_only)
       templates = []
       paths.each do|path|
-        templates += Dir[File.expand_path(name, path)].reject{|filename| file_only && File.directory?(filename) }
+        templates += Dir[File.expand_path(name, path)].reject{|filename| file_only && File.directory?(filename)}
       end
       templates
     end
@@ -103,9 +76,9 @@ module Peony
     # See #settings for an explanation.
     #
     # Returns things.
-    def method_missing(meth, *args, &blk)
-      if settings.include? meth 
-        settings.send meth, *args, &blk
+    def method_missing(method, *args, &blk)
+      if settings.respond_to? method, true
+        settings.__send__(method, *args, &blk)
       else
         super
       end

data/lib/peony/default.rb

@@ -14,8 +14,15 @@ set_default :group, 'admin'
 namespace :settings do
   desc 'List all the settings.'
   task :list do
-    settings.each do|k, v|
-      say "#{k} = #{settings.send(k)}", :green, true
+    settings.scopes.each do|name, scope|
+      say "scope: #{name}", :yellow
+        settings.with(scope) do
+          scope.each do|k, _|
+            with_padding do
+              say "#{k} = #{settings.send(k)}", :green, true
+            end
+          end
+        end
     end
   end
 end

data/lib/peony/rake.rb

@@ -1,4 +1,4 @@
-extend Peony::Utils
+extend Peony::Configure
 extend Peony::Shell
 extend Peony::Actions
 

data/lib/peony/scope.rb

@@ -0,0 +1,82 @@
+module Peony
+  class Scope < Hash
+    attr_reader :name
+
+    def initialize(name = nil, parent = nil)
+      @name = name
+      @parent = parent
+      yield name, self if block_given?
+    end
+
+    alias_method :local?, :has_key?
+
+    def [](key)
+      super || (@parent && @parent[key])
+    end
+
+    ## also change the method key?, include?, member?
+    #
+    def has_key?(key)
+      local?(key) || (!@parent.nil? && @parent.key?(key))
+    end
+
+    def []=(key, value)
+      if !local?(key) && @parent && @parent.has_key?(key)
+        @parent.set key, value
+      else
+        store(key, value)
+      end
+    end
+
+    def remove(key, recursively = false)
+      delete(key)
+      if recursively && @parent
+        @parent.remove(key, recursively)
+      end
+      self
+    end
+
+    def respond_to_missing?(method, _ = true)
+      self.include?(method) || method.to_s =~ /[a-z]\w*[?=!]?$/
+    end
+
+    alias_method :set,      :[]=
+    alias_method :local,    :store
+
+    alias_method :include?, :has_key?
+    alias_method :key?,     :has_key?
+    alias_method :member?,  :has_key?
+
+
+    def method_missing(method, *args, &block)
+      return evaluate(self.[](method), &block) if has_key?(method)
+      match = method.to_s.match(/(.*?)([?=!]?)$/)
+      case match[2]
+        when '='
+          #self[match[1].to_sym] = args.first || block
+          local(match[1].to_sym, args.first || block)
+        when '?'
+          !!self[match[1].to_sym]
+        when '!'
+          evaluate(fetch(match[1].to_sym), &block)  #just fetch local key
+        else
+          evaluate(self[match[1]], &block)          #support string key
+      end
+    end
+
+    def evaluate(value)
+      ret = value.is_a?(Proc) ? value.call : value
+      ret.nil? && block_given? ? yield : ret
+    end
+
+    def new_scope(name)
+      clazz = self.class
+      self.send(name) || Scope.new(name, self) do|_name, _scope|
+        clazz.send :define_method, _name do
+          _scope
+        end
+      end
+    end
+
+  end
+end

data/lib/peony/settings.rb

@@ -1,31 +1,32 @@
 module Peony
-  class Settings < Hash
-    def method_missing(method, *args, &block)
-      name = method.to_s
-      key, punct = name[0..-2].to_sym, name[-1..-1]
-      case punct
-      when '='
-        self[key] = args.first != nil ? args.first : block
-      when '?'
-        include? key
-      when '!'
-        raise Error, "Setting :#{key} is not set" unless include?(key)
-        evaluate self[key]
-      else
-        if include? method
-          evaluate self[method]
-        else
-          block.call unless block.nil? 
-        end
+  class Settings
+    attr_reader :current_scope, :root_scope
+
+    def initialize
+      @current_scope = @root_scope = Scope.new(:root)
+    end
+
+    def with_scope(name)
+      original_scope = current_scope
+      begin
+        @current_scope = original_scope.new_scope(name)
+        yield
+      ensure
+        @current_scope = original_scope
       end
     end
 
-    def evaluate(value)
-      if value.is_a?(Proc)
-        value.call
+    def method_missing(method, *args, &block)
+      if current_scope.respond_to?(method, false)
+        current_scope.__send__(method, *args, &block)
       else
-        value
+        super
       end
     end
+
+    def respond_to_missing?(method, include_all = true)
+      current_scope.respond_to?(method, include_all)
+    end
+
   end
-end
+end

data/lib/peony/shell/basic.rb

@@ -10,7 +10,7 @@ module Peony
       # Initialize base, mute and padding to nil.
       #
       def initialize #:nodoc:
-        @base, @mute, @padding, @always_force = nil, false, 0, false
+        @base, @mute, @padding, @always_force = nil, false, Padding.new, false
       end
 
       # Mute everything that's inside given block
@@ -28,20 +28,6 @@ module Peony
         @mute
       end
 
-      # Sets the output padding, not allowing less than zero values.
-      #
-      def padding_to(value)
-        @padding = [0, value].max
-      end
-
-      def padding_up
-        @padding += 1
-      end
-
-      def padding_down
-        @padding += 1
-      end
-
       # Asks something to the user and receives a response.
       #
       # If asked to limit the correct responses, you can pass in an
@@ -99,7 +85,7 @@ module Peony
       #
       def say_status(status, message, log_status = true)
         return if quiet? || log_status == false
-        spaces = '  ' * (padding + 1)
+        spaces = '  ' * (padding.value + 1)
         color  = log_status.is_a?(Symbol) ? log_status : :green
 
         status = status.to_s.rjust(12)
@@ -299,7 +285,7 @@ module Peony
       protected
 
       def prepare_message(message, *color)
-        spaces = '  ' * padding
+        spaces = '  ' * padding.value
         spaces + set_color(message.to_s, *color)
       end
 
@@ -425,5 +411,21 @@ module Peony
         correct_answer
       end
     end
+
+    class Padding
+      attr_accessor :value
+
+      def initialize
+        @value = 0
+      end
+
+      def up
+        @value += 1
+      end
+
+      def down
+        @value -= 1
+      end
+    end
   end
 end

data/lib/peony/shell.rb

@@ -1,8 +1,7 @@
 module Peony
   module Shell
     SHELL_DELEGATED_METHODS = [:ask, :error, :set_color, :yes?, :no?, :say, :say_status, :print_in_columns,
-                               :print_table, :print_wrapped, :file_collision, :terminal_width, :padding,
-                               :padding_to, :padding_up, :padding_down]
+                               :print_table, :print_wrapped, :file_collision, :terminal_width, :padding]
 
     # The following classes's code was copied from Thor, available under MIT-LICENSE
     # Copyright (c) 2008 Yehuda Katz, Eric Hodel, et al.
@@ -34,10 +33,10 @@ module Peony
 
     # Yields the given block with padding.
     def with_padding
-      shell.padding_up
+      self.padding.up
       yield
     ensure
-      shell.padding_down
+      self.padding.down
     end
 
   end

data/lib/peony/version.rb

@@ -1,3 +1,3 @@
 module Peony
-  VERSION = '0.1.9'
+  VERSION = '0.3.0'
 end

data/lib/peony.rb

@@ -5,11 +5,14 @@ module Peony
   PREFIX = File.dirname(__FILE__)
   ROOT = File.expand_path('../../', __FILE__)
 
-  autoload :Utils,      'peony/utils'
+  autoload :Scope,      'peony/scope'
+  autoload :Settings,   'peony/settings'
+  autoload :Configure,  'peony/configure'
+
   autoload :Shell,      'peony/shell'
-  autoload :Actions,    'peony/actions'
   autoload :LineEditor, 'peony/line_editor'
-  autoload :Settings,   'peony/settings'
+  autoload :Actions,    'peony/actions'
+
   
   Error = Class.new(Exception)
   

data/recipes/db/mongo.rake

@@ -1,30 +1,30 @@
-set_default :mongod, '/usr/local/bin/mongod'
+scope :mongo do
+  set_default :mongod,      '/usr/local/bin/mongod'
+  set_default :master_name, 'master'
+  set_default :slave_name,  'slave'
 
-set_default :mongo_master_name, 'master'
-set_default :mongo_slave_name,  'slave'
+  set_default :master_dir,    ->{ "#{data_dir}/mongo/#{mongo.master_name}" }
+  set_default :slave_dir,     ->{ "#{data_dir}/mongo/#{mongo.slave_name}" }
+  set_default :etc_dir,       ->{ "#{etc_dir}/mongo" }
+  set_default :log_dir,       ->{ "#{log_dir}/mongo" }
+  set_default :run_dir,       ->{ "#{run_dir}/mongo" }
 
-set_default :mongo_master_dir,  ->{ "#{data_dir}/mongo/#{mongo_master_name}" }
-set_default :mongo_slave_dir,   ->{ "#{data_dir}/mongo/#{mongo_slave_name}" }
-set_default :mongo_etc_dir,   ->{ "#{etc_dir}/mongo" }
-set_default :mongo_log_dir,   ->{ "#{log_dir}/mongo" }
-set_default :mongo_run_dir,   ->{ "#{run_dir}/mongo" }
+  set_default :fork,        true
+  set_default :jsonp,       true
+  set_default :rest,        true
 
+  set_default :master_port, 27017
+  set_default :slave_port,  27018
+  set_default :slave_source,  ->{ "127.0.0.1:#{mongo.master_port}" }
 
-set_default :mongo_fork , true
-set_default :mongo_jsonp, true
-set_default :mongo_rest , true
+  set_default :master_conf,   ->{ "#{mongo.etc_dir}/#{mongo.master_name}.conf" }
+  set_default :slave_conf,    ->{ "#{mongo.etc_dir}/#{mongo.slave_name}.conf" }
 
-set_default :mongo_master_port, 27017
-set_default :mongo_slave_port,  27018
-set_default :mongo_slave_source,  ->{ "127.0.0.1:#{mongo_master_port}" }
-                                                       
-set_default :mongo_master_conf,   ->{ "#{mongo_etc_dir}/#{mongo_master_name}.conf" }
-set_default :mongo_slave_conf,    ->{ "#{mongo_etc_dir}/#{mongo_slave_name}.conf" }
-
-set_default :mongo_master_start,  ->{ "#{mongod} --config #{mongo_master_conf}" }
-set_default :mongo_slave_start,   ->{ "#{mongod} --config #{mongo_slave_conf}" }
-set_default :mongo_master_stop,   ->{ "kill -2 `cat #{mongo_run_dir}/#{mongo_master_name}.pid`" }
-set_default :mongo_slave_stop,    ->{ "kill -2 `cat #{mongo_run_dir}/#{mongo_slave_name}.pid`" }
+  set_default :master_start,  ->{ "#{mongo.mongod} --config #{mongo.master_conf}" }
+  set_default :slave_start,   ->{ "#{mongo.mongod} --config #{mongo.slave_conf}" }
+  set_default :master_stop,   ->{ "kill -2 `cat #{mongo.run_dir}/#{mongo.master_name}.pid`" }
+  set_default :slave_stop,    ->{ "kill -2 `cat #{mongo.run_dir}/#{mongo.slave_name}.pid`" }
+end
 
 
 namespace :db do  
@@ -32,9 +32,9 @@ namespace :db do
     
     desc 'Create the directory for mongodb, and copy mongo config file to etc directory.'
     task :init do
-      mkdir_p(mongo_master_dir, mongo_slave_dir, mongo_etc_dir, mongo_log_dir, mongo_run_dir)
-      template('mongo/master.conf.erb', mongo_master_conf, true)
-      template('mongo/slave.conf.erb', mongo_slave_conf, true)
+      mkdir_p(mongo.master_dir, mongo.slave_dir, mongo.etc_dir, mongo.log_dir, mongo.run_dir)
+      template('mongo/master.conf.erb', mongo.master_conf, true)
+      template('mongo/slave.conf.erb', mongo.slave_conf, true)
     end
     
     [:master, :slave].each do|ns|
@@ -42,7 +42,7 @@ namespace :db do
         [:start, :stop].each do|t|
           desc "#{t} mongodb #{ns}"
           task t do
-            run self.send("mongo_#{ns}_#{t}")
+            run mongo.send("#{ns}_#{t}")
           end
         end
       end