egi 0.0.2 → 0.0.3

data/.travis.yml

@@ -0,0 +1,5 @@
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - ruby-head

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 0.0.3
+* ENHANCEMENT
+    * EGI.env loads Egi.config_file, ./egi.conf, or /etc/egi.conf
+    * you can set default to env and group
+
 ## 0.0.2
 * ENHANCEMENT
     * CAP_ENV to set environment and get by Egi.env

data/README.md

@@ -1,4 +1,6 @@
-# egi
+# egi [![Build Status](https://secure.travis-ci.org/okitan/egi.png)](http://travis-ci.org/okitan/egi)
+
+tested in ruby 1.8.7, 1.9.2, 1.9.3, and head
 
 ## About egi
 environment, group, and item
@@ -7,6 +9,9 @@ environment, group, and item
 
     % cat egi.conf
     env(:development) {
+      item :vhost0301, { :tags => [ :mysqld, :rails ] }
+    }
+    env(:production) {
       group(:mysqld) {
         item :vhost0421, { :tags => [ :master ] }
         item :vhost0422
@@ -15,7 +20,7 @@ environment, group, and item
       # you can define item without group
       item :vhost0423, { :tags => [ :rails ] }
     }
-    % EGI_ENV=egi irb
+    % EGI_ENV=production irb
     > require 'egi'
     > # find by group or tag
     > Egi.env.mysqld #=> [ { :name => :vhost0421, :tags => [ :mysqld, :master ] },
@@ -24,19 +29,41 @@ environment, group, and item
     > Egi.env.master #=> [ { :name => :vhost0421, :tags => [ :mysqld, :master ] } ]
     > # fetch by name
     > Egi.env.vhost0423 #=> { :name => :vhost0423, :tags => [ :rails ]}, 
-
+    % EGI_ENV=development irb
+    > require 'egi'
+    > Egi.env.mysqld #=> [ { :name => :vhost0301, :tags => [ :mysqld, :rails ] } ]
+    # can not fetch other envs
+    > Egi.env.vhost0421 #=> nil
 
 ## Syntax
 
 ### env
-T.B.D
+    env(name, &block)
+* name
+    * the name of env
+* &block
+    * to define item
 
 ### group
-not yet implemented
+tag to the member of the group.
+
+    group(name, &block)
+* name
+    * the name of group
+    * tagged to the member of the group
+* &block
+    * to define item for the member of the group
 
 ### item
-T.B.D
+    item(name, hash)
+* name
+    * the name of item
+    * if defined the same name, hash will be merged
+* hash
+    * the property of item
+    * :tags
+        * you can search by tags
 
 ## Aliases
 
-T.B.D
+not yet implemented

data/Rakefile

@@ -1 +1,9 @@
 require "bundler/gem_tasks"
+
+require 'rspec/core'
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = FileList['spec/**/*_spec.rb']
+end
+
+task :default => :spec

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/egi.gemspec

@@ -19,8 +19,9 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   # specify any dependencies here; for example:
-  [ [ 'rspec' ],
-    [ 'autowatchr' ]
+  [ [ 'rake' ],
+    [ 'rspec' ],
+    [ 'autowatchr' ],
   ].each do |gem, version|
     s.add_development_dependency gem, version
   end

data/lib/egi/env.rb

@@ -1,7 +1,12 @@
 module Egi
   class Env
     def initialize(name)
-      @name = name
+      @name    = name
+      @default = {}
+    end
+
+    def set(default = {})
+      @default = default
     end
 
     def merge!(other)
@@ -15,10 +20,10 @@ module Egi
     end
 
     def items
-      @items ||= Hash.new {|hash, key| hash[key] = Item[:name => key] }
+      @items ||= Hash.new {|hash, key| hash[key] = Item[{ :name => key }.merge(@default)] }
     end
 
-    def item(name, hash)
+    def item(name, hash = {})
       items[name.to_sym].update(hash)
     end
   end

data/lib/egi/group.rb

@@ -2,13 +2,23 @@ module Egi
   class Group
     def initialize(name = nil)
       @tags = name ? [ name ] : [ ]
+      @default = {}
+    end
+
+    def set(default)
+      @default = default
+    end
+
+    def instance_eval(&block)
+      super
+      self # for method chain
     end
 
     def items
-      @items ||= Hash.new {|hash, key| hash[key] = Item[:name => key, :tags => @tags] }
+      @items ||= Hash.new {|hash, key| hash[key] = Item[{ :name => key, :tags => @tags }.merge(@default)] }
     end
 
-    def item(name, hash)
+    def item(name, hash = {})
       items[name.to_sym].update(hash)
       self # for method chain
     end

data/lib/egi/sandbox.rb

@@ -13,24 +13,31 @@ module Egi
       @current_env = name
       
       to_load = opts[:load]
-      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
+      envs[name].merge!(envs[to_load]) if envs.has_key?(to_load)
+      envs[name].instance_eval(&block) if block_given?
     end
 
     def eval(str)
       instance_eval(str)
+      
+      # define method_missing to access items
+      envs.each_value do |env|
+        def env.method_missing(name, *args)
+          super if args.size > 0
+          items.has_key?(name) ? items[name] : nil
+        end
+      end
+
       envs
     end
 
-    def method_missing(name, *args)
-      envs[@current_env].send(name, *args)
+    def method_missing(name, *args, &block)
+      begin
+        envs[@current_env].send(name, *args, &block)
+      rescue => e
+        puts "#{name}(#{args}) #{block_given? ? "with block" : ""} is called at #{@current_env} env"
+        raise e
+      end        
     end
   end
 end

data/lib/egi.rb

@@ -7,6 +7,8 @@ module Egi
   autoload :Item,    'egi/item'
 
   def env
+    load_file(config_file) unless @env
+
     name = ENV['EGI_ENV'] || 'default'
     self[name]
   end
@@ -15,6 +17,10 @@ module Egi
     @env.has_key?(name) ? @env[name] : nil
   end
 
+  def load_file(file)
+    load(File.read(file))
+  end
+
   def load(str)
     @env = Sandbox.new.eval(str)
   end
@@ -22,5 +28,16 @@ module Egi
   def reset
     @env = nil
   end
-  module_function :[], :load, :reset
+  def config_file
+    @config_file || 
+      ( File.exist?('./egi.conf')    && './egi.conf' ) ||
+      ( File.exist?('/etc/egi.conf') && '/etc/egi.conf') ||
+      raise('you should set Egi.config_file or put ./egi.conf or /etc/egi.conf')
+  end
+
+  def config_file=(file)
+    @config_file = file
+  end
+
+  module_function :env, :[], :load, :reset, :config_file, :config_file=
 end

data/spec/egi_spec.rb

@@ -14,21 +14,82 @@ RSpec::Matchers.define :have_item do |key, value|
   diffable
 end
 
+shared_examples_for :sample_environments do
+  context 'makes env1' do
+    subject { described_class[:env1] }
+    
+    it { should have_item(:a, :hoge => :fuga) }
+    it { should have_item(:b, :fuga => :ugu)  }
+  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 'makes env2' do
+    subject { described_class[:env2] }
+    
+    it { should have_item(:a, :hoge => :ugu) }
+    its(:b) { should be_nil }
+  end
+
+  context 'makes loaded_env1 which loads env1' do
+    subject { described_class[:loaded_env1] }
+    
+    it { should have_item(:a, :hoge => :ugu) }
+    it { should have_item(:b, :fuga => :ugu) }
+  end
+
+  context 'makes env with default' do
+    subject { described_class[:env_with_default] }
+    
+    it { should have_item(:a, :hoge => :ugu) }
+    it { should have_item(:b, :hoge => :fuga) }
+    it { should have_item(:c, :hoge => :piyo, :tags => []) }
+    it { should have_item(:d, :hoge => :puyo, :tags => []) }
+  end
+  
+  context 'does not make env3' do
+    subject { described_class[:env3] }
+    it { should be_nil }
+  end
+end
+
 describe klass, '.load environments:' do
   environments = <<-EOS
 env(:env1) {
-  item :a, { :hoge => :fuga }
-  item :b, { :fuga => :ugu  }
+  item :a, :hoge => :fuga
+  item :b, :fuga => :ugu
 }
 
+env(:env_group) {
+  group(:hoge) {
+    item :a, :hoge => :fuga
+    item :b, :tags => [ :fuga ]
+  }
+}
+ 
 env(:env2) {
-  item :a, { :hoge => :ugu }
+  item :a, :hoge => :ugu
 }
 
-env(:env_group) {
-  group(:hoge) {
-    item :a, { :hoge => :fuga }
-    item :b, { :tags => [ :fuga ] }
+env(:loaded_env1, :load => :env1) {
+  item :a, :hoge => :ugu
+}
+
+env(:env_with_default) {
+  set :hoge => :ugu
+
+  item :a
+  item :b, :hoge => :fuga
+
+  group {
+    set :hoge => :piyo
+
+    item :c
+    item :d, :hoge => :puyo
   }
 }
   EOS
@@ -37,99 +98,45 @@ env(:env_group) {
     before(:all) { described_class.load(environments) }
     after(:all)  { described_class.reset }
     
-    context 'makes env1' do
-      subject { described_class[:env1] }
-      
-      it { should have_item(:a, :hoge => :fuga) }
-      it { should have_item(:b, :fuga => :ugu)  }
-    end
-
-    context 'makes env2' do
-      subject { described_class[:env2] }
-
-      it { should have_item(:a, :hoge => :ugu) }
-      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 }
-    end
+    it_should_behave_like :sample_environments
   end
 end
 
-describe klass, '.load environments:' do
+describe klass, '.load flat environments:' do
   environments = <<-EOS
 env :env1
-item :a, { :hoge => :fuga }
-item :b, { :fuga => :ugu  }
+item :a, :hoge => :fuga
+item :b, :fuga => :ugu
+
+env :env_group
+group(:hoge) {
+  item :a, :hoge => :fuga
+  item :b, :tags => [ :fuga ]
+}
 
 env :env2
-item :a, { :hoge => :ugu }
-  EOS
+item :a, :hoge => :ugu
 
-  context "\n#{environments}" do
-    before(:all) { described_class.load(environments) }
-    after(:all)  { described_class.reset }
-    
-    context 'makes env1' do
-      subject { described_class[:env1] }
-      
-      it { should have_item(:a, :hoge => :fuga) }
-      it { should have_item(:b, :fuga => :ugu)  }
-    end
-
-    context 'makes env2' do
-      subject { described_class[:env2] }
-
-      it { should have_item(:a, :hoge => :ugu) }
-      its(:b) { should be_nil }
-    end
-
-    context 'does not make env3' do
-      subject { described_class[:env3] }
-      it { should be_nil }
-    end
-  end
-end
+env :loaded_env1, :load => :env1
+item :a, :hoge => :ugu
 
-describe klass, '.load environments using load to inherit default:' do
-  environments = <<-EOS
-env :env1
-item :a, { :hoge => :fuga }
-item :b, { :fuga => :ugu  }
+env :env_with_default
+set :hoge => :ugu
 
-env :env2, :load => :env1
-item :a, { :hoge => :ugu }
+item :a
+item :b, :hoge => :fuga
+group {
+  set :hoge => :piyo
+
+  item :c
+  item :d, :hoge => :puyo
+}
   EOS
 
   context "\n#{environments}" do
     before(:all) { described_class.load(environments) }
     after(:all)  { described_class.reset }
     
-    context 'makes env1' do
-      subject { described_class[:env1] }
-      
-      it { should have_item(:a, :hoge => :fuga) }
-      it { should have_item(:b, :fuga => :ugu)  }
-    end
-
-    context 'makes env2' do
-      subject { described_class[:env2] }
-
-      it { should have_item(:a, :hoge => :ugu) }
-      it { should have_item(:b, :fuga => :ugu) }
-    end
-
-    context 'does not make env3' do
-      subject { described_class[:env3] }
-      it { should be_nil }
-    end
+    it_should_behave_like :sample_environments
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: egi
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-25 00:00:00.000000000 Z
+date: 2011-11-28 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &84892960 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *84892960
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &71572070 !ruby/object:Gem::Requirement
+  requirement: &84892670 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *71572070
+  version_requirements: *84892670
 - !ruby/object:Gem::Dependency
   name: autowatchr
-  requirement: &71571750 !ruby/object:Gem::Requirement
+  requirement: &84892430 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *71571750
+  version_requirements: *84892430
 description: manage multi-environments
 email:
 - okitakunio@gmail.com
@@ -43,6 +54,7 @@ files:
 - .gitignore
 - .rspec
 - .rvmrc
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - README.md