egi 0.0.1 → 0.0.2

data/CHANGELOG.md

@@ -0,0 +1,11 @@
+# CHANGELOG
+
+## 0.0.2
+* ENHANCEMENT
+    * CAP_ENV to set environment and get by Egi.env
+
+## 0.0.1
+* ENHANCEMENT
+    * DSL:env for managing multi envs
+    * DSL:env can inherit other env
+    * DSL:item to declare item

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/lib/egi/env.rb

@@ -10,16 +10,16 @@ module Egi
       items.merge!(Marshal.load(Marshal.dump(Hash[other])))
     end
 
-    def items
-      @items ||= Hash.new {|hash, key| hash[key] = { :name => key } }
+    def group(name = nil, &block)
+      items.merge!(Class.new(Group).new(name).instance_eval(&block).items)
     end
 
-    def item(name, hash)
-      items[name.to_sym].merge!(hash)
+    def items
+      @items ||= Hash.new {|hash, key| hash[key] = Item[:name => key] }
     end
 
-    def method_missing(name, *args)
-      items.has_key?(name) ? items[name] : nil
+    def item(name, hash)
+      items[name.to_sym].update(hash)
     end
   end
 end

data/lib/egi/group.rb

@@ -0,0 +1,17 @@
+module Egi
+  class Group
+    def initialize(name = nil)
+      @tags = name ? [ name ] : [ ]
+    end
+
+    def items
+      @items ||= Hash.new {|hash, key| hash[key] = Item[:name => key, :tags => @tags] }
+    end
+
+    def item(name, hash)
+      items[name.to_sym].update(hash)
+      self # for method chain
+    end
+  end
+end
+

data/lib/egi/item.rb

@@ -0,0 +1,16 @@
+module Egi
+  class Item < Hash
+    def initialize(ifnone = nil, &block)
+      super
+      self[:tags] ||= []
+    end
+
+    def update(other)
+      if tags = other.delete(:tags)
+        self[:tags] += Array(tags)
+      end
+
+      super
+    end
+  end
+end

data/lib/egi/sandbox.rb

@@ -13,8 +13,15 @@ module Egi
       @current_env = name
       
       to_load = opts[:load]
-      envs[name].merge!(envs[to_load]) if envs.has_key?(to_load)
-      envs[name].instance_eval(&block) if block_given?
+      env = envs[name]
+      env.merge!(envs[to_load]) if envs.has_key?(to_load)
+      env.instance_eval(&block) if block_given?
+      
+      # define method_missing to access item
+      def env.method_missing(name, *args)
+        raise MethodMissing if args.size > 0
+        items.has_key?(name) ? items[name] : nil
+      end
     end
 
     def eval(str)

data/lib/egi.rb

@@ -3,6 +3,13 @@ module Egi
 
   autoload :Sandbox, 'egi/sandbox'
   autoload :Env,     'egi/env'
+  autoload :Group,   'egi/group'
+  autoload :Item,    'egi/item'
+
+  def env
+    name = ENV['EGI_ENV'] || 'default'
+    self[name]
+  end
   
   def [](name)
     @env.has_key?(name) ? @env[name] : nil

data/spec/egi/group_spec.rb

@@ -0,0 +1,7 @@
+require 'spec_helper'
+
+klass = Egi::Group
+
+describe klass do
+  it
+end

data/spec/egi/item_spec.rb

@@ -0,0 +1,7 @@
+require 'spec_helper'
+
+klass = Egi::Item
+
+describe klass do
+  it
+end

data/spec/egi_spec.rb

@@ -24,6 +24,13 @@ env(:env1) {
 env(:env2) {
   item :a, { :hoge => :ugu }
 }
+
+env(:env_group) {
+  group(:hoge) {
+    item :a, { :hoge => :fuga }
+    item :b, { :tags => [ :fuga ] }
+  }
+}
   EOS
 
   context "\n#{environments}" do
@@ -44,6 +51,12 @@ env(:env2) {
       its(:b) { should be_nil }
     end
 
+    context 'makes env_group' do
+      subject { described_class[:env_group] }
+      it { should have_item(:a, :hoge => :fuga, :tags => [ :hoge ]) }
+      it { should have_item(:b, :tags => [ :hoge, :fuga ]) }
+    end
+
     context 'does not make env3' do
       subject { described_class[:env3] }
       it { should be_nil }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: egi
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-22 00:00:00.000000000 Z
+date: 2011-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70035350 !ruby/object:Gem::Requirement
+  requirement: &71572070 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70035350
+  version_requirements: *71572070
 - !ruby/object:Gem::Dependency
   name: autowatchr
-  requirement: &70035070 !ruby/object:Gem::Requirement
+  requirement: &71571750 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70035070
+  version_requirements: *71571750
 description: manage multi-environments
 email:
 - okitakunio@gmail.com
@@ -43,6 +43,7 @@ files:
 - .gitignore
 - .rspec
 - .rvmrc
+- CHANGELOG.md
 - Gemfile
 - README.md
 - Rakefile
@@ -50,8 +51,12 @@ files:
 - egi.gemspec
 - lib/egi.rb
 - lib/egi/env.rb
+- lib/egi/group.rb
+- lib/egi/item.rb
 - lib/egi/sandbox.rb
 - spec/egi/env_spec.rb
+- spec/egi/group_spec.rb
+- spec/egi/item_spec.rb
 - spec/egi/sandbox_spec.rb
 - spec/egi_spec.rb
 - spec/spec.watchr
@@ -82,6 +87,8 @@ specification_version: 3
 summary: manage multi-environments
 test_files:
 - spec/egi/env_spec.rb
+- spec/egi/group_spec.rb
+- spec/egi/item_spec.rb
 - spec/egi/sandbox_spec.rb
 - spec/egi_spec.rb
 - spec/spec.watchr