simsim 0.1.1 → 0.1.2

data/Rakefile

@@ -10,7 +10,7 @@ begin
     gem.email = "priteau@gmail.com"
     gem.homepage = "http://github.com/priteau/simsim"
     gem.authors = ["Pierre Riteau"]
-    gem.add_dependency("restfully", '>= 0.3.1')
+    gem.add_dependency("restfully", '>= 0.4.1')
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/bin/simsim

@@ -5,7 +5,6 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'erb'
 require 'optparse'
 require 'restfully'
-require 'yaml'
 
 @options = {}
 option_parser = OptionParser.new do |opts|
@@ -15,7 +14,7 @@ option_parser = OptionParser.new do |opts|
     @options[:access] = a
   end
   opts.on('-c=', '--config=', 'Sets the various options based on a custom YAML configuration file') do |c|
-    @options[:config] = c
+    @options[:configuration_file] = c
   end  
   opts.on_tail('-h', '--help', 'Show this message') do
     STDERR.puts opts
@@ -25,25 +24,18 @@ end
 option_parser.parse!
 
 @access_site = @options[:access]
-if @access_site.nil? || @options[:config].nil?
+if @access_site.nil? || @options[:configuration_file].nil?
   STDERR.puts "error: --access and --config options are required"
   STDERR.puts option_parser
   exit 1
 end
 
-if (config_filename = @options.delete(:config)) && File.exists?(File.expand_path(config_filename))
-  config = YAML.load_file(File.expand_path(config_filename))
-  @base_uri = config.delete('base_uri') || @base_uri
-  @root_path = config.delete('root_path') || @root_path
-  @options.merge!(config)
-end
-
 @sites = Hash.new { |hash, key| hash[key] = Array.new }
 
-Restfully::Session.new(@options.merge(:root_path => @root_path, :base_uri => @base_uri)) do |grid, session|
+Restfully::Session.new(@options.merge(:base_uri => @base_uri)) do |grid, session|
   grid.sites.each do |site|
     site.clusters.each do |cluster|
-      @sites[site.uid].push(cluster.uid)
+      @sites[site['uid']].push(cluster['uid'])
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: simsim
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Pierre Riteau
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-28 00:00:00 +01:00
+date: 2009-11-16 00:00:00 +01:00
 default_executable: simsim
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.3.1
+        version: 0.4.1
     version: 
 description: simsim generates an ssh_config file allowing to easily connect from your workstation to all compute nodes in Grid'5000. Since it is based on an ERB template, the generated ssh_config can be customized at will.
 email: priteau@gmail.com