claudius 0.0.1 → 0.0.2

data/README.md

@@ -7,7 +7,9 @@ Claudius is a easy-to-use domain specific language for clouds experiments. Langu
 
 Install it as:
 
-    $ sudo gem install claudius-0.0.1.gem
+    $ sudo gem install claudius
+
+If you want export execution tree to image you need [Graphivz](http://www.graphviz.org).
 
 ## Usage
 

data/claudius.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "claudius"
-  spec.version       = "0.0.1"
+  spec.version       = "0.0.2"
   spec.authors       = ["radk0s", "blost"]
   spec.email         = ["rachamot@gmail.com"]
   spec.description   = "Write a gem description"

data/examples/on_instance.rb

@@ -1,15 +1,46 @@
+require 'claudius'
+require "awesome_print"
 
-# Initiate experiment
-# ---------
-# Getting started Claudius is extremely simple. First example illustrates how to perform experiment which writes Hello World! to TestFile in your current directory
+experiment_tree = experiment 'sdsdf' do
+  define_providers do
+    # cloud('aws', :provider => config['provider'],
+    #               :region=>config['region'],
+    #               :aws_access_key_id => config['aws_access_key_id'],
+    #               :aws_secret_access_key => config['aws_secret_access_key'])
+    # .create_instances(['t1.micro'], 'ubuntu', './Piotr-key-pair-irleand.pem',
+    #               :key_name => 'Piotr-key-pair-irleand',
+    #               :groups => 'Piotr-irleand')
+    manual('kali', '192.168.1.116', 'root', :password => 'toor', :port => 22)
+  end
 
-# To use the DSL in your code, please require the gem:
-require 'claudius'
-# We sepcified te __experiment__ with name "Hello". Tree which represents our experiment was returned after parse DSL.
-execution_tree = experiment 'Hello' do
-# __execute__ is a block where we can specify particular commands.
-  execute do
-# Each starts with __ssh__ following by string represets command.
-    ssh "echo Hello World! > TestFile"
+  foreach ['kali', 't1.micro'] do |instance|
+    foreach ['a', 'b'] do |param|
+      before do
+      end
+      on instance do
+        execute 'install prerequisites' do
+          ssh "curl -O http://pegasus.isi.edu/montage/Montage_v3.3_patched_4.tar.gz"
+          ssh "tar zxvf Montage_v3.3_patched_4.tar.gz"
+          ssh "cd Montage_v3.3_patched_4"
+          ssh "make"
+          ssh "cd .."
+          ssh "git clone https://github.com/dice-cyfronet/hyperflow.git --depth 1 -b develop"
+          ssh "cd hyperflow"
+          ssh "npm install"
+          ssh "curl -O https://dl.dropboxusercontent.com/u/81819/hyperflow-amqp-executor.gem"
+          ssh "echo toor | sudo -S gem2.0 install --no-ri --no-rdoc hyperflow-amqp-executor.gem"
+        end
+        execute do
+          ssh "date"
+        end
+        execute do
+          ssh "echo #{param}"
+        end
+      end
+      after do
+      end
+    end
   end
 end
+
+experiment_tree.export_tree

data/examples/simple_program.rb

@@ -1,4 +1,4 @@
-
+require 'awesome_print'
 # Initiate experiment
 # ---------
 #
@@ -7,10 +7,20 @@
 # To use the DSL in your code, please require the gem:
 require 'claudius'
 # We sepcified te __experiment__ with name "Hello". Tree which represents our experiment was returned after parse DSL.
-execution_tree = experiment 'Hello' do
+execution_tree =
+experiment 'Hello Experiment' do
+  before do
+    ssh "echo $PATH"
+  end
+
 # __execute__ is a block where we can specify particular commands.
-execute do
+  execute do
 # Each starts with __ssh__ following by string represets command.
-		ssh "echo Hello World! > TestFile"
-	end
+    ssh "echo Hello World! > TestFile"
+  end
 end
+
+# execute tree and print result time
+ap execution_tree.run
+# export tree to tree.png and tree.dot
+execution_tree.export_tree('tree')

data/examples/specify_instances.rb

@@ -4,19 +4,19 @@
 # To conduct an experiment remotely, You should define set of machines, which you would like to use. Claudius allows you to define 2 types of hosts - ones which are going to be created in clouds environment, and others which are already established (and you have access to them). To define machine and to maintain connection with them you should provide required parameters. For your convenience, you may store all yours parameters in json file, and recall them as it is presented in example.
 #
 require 'claudius'
-config = load_config('./user_config.json')
+# config = load_config('./user_config.json')
 experiment 'Hello' do
   define_providers do
-    cloud('aws',  :provider => config['provider'],
-          :region =>config['region'],
-          :endpoint => 'https://ec2.eu-west-1.amazonaws.com/',
-          :aws_access_key_id => config['aws_access_key_id'],
-          :aws_secret_access_key => config['aws_secret_access_key'])
-    .create_instances(['t1.micro=>in1'],
-                      :username => 'ubuntu',
-                      :private_key_path =>'./Piotr-key-pair-irleand.pem',
-                      :key_name => 'Piotr-key-pair-irleand',
-                      :groups => ['Piotr-irleand'])
+    # cloud('aws',  :provider => config['provider'],
+    #       :region =>config['region'],
+    #       :endpoint => 'https://ec2.eu-west-1.amazonaws.com/',
+    #       :aws_access_key_id => config['aws_access_key_id'],
+    #       :aws_secret_access_key => config['aws_secret_access_key'])
+    # .create_instances(['t1.micro=>in1'],
+    #                   :username => 'ubuntu',
+    #                   :private_key_path =>'./Piotr-key-pair-irleand.pem',
+    #                   :key_name => 'Piotr-key-pair-irleand',
+    #                   :groups => ['Piotr-irleand'])
     manual('kali', '172.16.0.109', 'root', :password => 'toor')
   end
   foreach ['kali', 'in1'] do |instance|

data/lib/tree_building/claudius.rb

@@ -7,31 +7,24 @@ def experiment(name, &block)
 end
 
 class Experiment
-  #attr_accessor :child_node
-
-  $child_node
-  $current_node = nil
-  $tmp_asynchronously = false
-  $tmp_safely = false
-  $tmp_execution_place = 'localhost'
-  $in_after_scope = false
-  $in_before_scope = false
-
-  $root
-
   def initialize(name, &block)
-    $root = Node.new(nil,block)
-    $current_node = $root
-    $root.name = name
+    @child_node
+    @current_node = nil
+    @tmp_asynchronously = false
+    @tmp_safely = false
+    @tmp_execution_place = 'localhost'
+    @in_after_scope = false
+    @in_before_scope = false
+    @root = Node.new(nil,block)
+    @current_node = @root
+    @root.name = name
     instance_eval(&block) if block
-    $root.print_tree
-    run_with_time
   end
 
   def asynchronously
-     $child_node = ConcurrentNode.new($current_node, nil)
-     $current_node.node_list.push($child_node)
-     $current_node = $child_node
+     @child_node = ConcurrentNode.new(@current_node, nil)
+     @current_node.node_list.push(@child_node)
+     @current_node = @child_node
   end
 
   def safely
@@ -39,71 +32,73 @@ class Experiment
   end
 
   def before(*args, &block)
-    $in_before_scope = true
+    @in_before_scope = true
     yield
-    $in_before_scope = false
+    @in_before_scope = false
   end
 
   def after(*args, &block)
-      $in_after_scope = true
+      @in_after_scope = true
       yield
-      $in_after_scope = false
+      @in_after_scope = false
   end
 
   def foreach(parameters, *args, &block)
-    puts $current_node.name
+    puts @current_node.name
     parameters.each do |parameter|
-      $child_node = Node.new($current_node, block)
-      $child_node.is_safely = $tmp_safely
-      $child_node.is_asynchronously = $tmp_asynchronously
-      $current_node.node_list.push($child_node)
-      $current_node = $child_node
+      @child_node = Node.new(@current_node, block)
+      @child_node.is_safely = @tmp_safely
+      @child_node.is_asynchronously = @tmp_asynchronously
+      @current_node.node_list.push(@child_node)
+      @current_node = @child_node
       block.call parameter
-      $current_node = $current_node.parent
+      @current_node = @current_node.parent
     end
   end
 
   def on(instance, *args, &block)
-    $child_node = OnNode.new($current_node, instance, block)
+    @child_node = OnNode.new(@current_node, instance, block)
 
-    $current_node.node_list.push($child_node)
-    $current_node = $child_node
+    @current_node.node_list.push(@child_node)
+    @current_node = @child_node
     block.call
-    $current_node = $current_node.parent
+    @current_node = @current_node.parent
   end
 
   def concurrent(*args, &block)
-    $child_node = ConcurrentNode.new($current_node, block)
-    $current_node.node_list.push($child_node)
-    $current_node = $child_node
+    @child_node = ConcurrentNode.new(@current_node, block)
+    @current_node.node_list.push(@child_node)
+    @current_node = @child_node
     block.call
-    $current_node = $current_node.parent
+    @current_node = @current_node.parent
   end
 
   def execute(*args, &block)
-    $child_node = ExecutionNode.new($current_node, block)
-    $child_node.is_safely = $tmp_safely
-    $child_node.is_asynchronously = $tmp_asynchronously
-    $current_node.node_list.push($child_node)
-    $current_node = $child_node
+    @child_node = ExecutionNode.new(@current_node, block)
+    @child_node.is_safely = @tmp_safely
+    @child_node.is_asynchronously = @tmp_asynchronously
+    @current_node.node_list.push(@child_node)
+    @current_node = @child_node
     block.call
-    $current_node = $current_node.parent
+    @current_node = @current_node.parent
   end
 
   def ssh(command)
-    if $in_before_scope
-      $current_node.before_list.push(command)
+    if @in_before_scope
+      @current_node.before_list.push(command)
     elsif $in_after_scope
-      $current_node.after_list.push(command)
+      @current_node.after_list.push(command)
     else
-      $current_node.commands.push(command)
+      @current_node.commands.push(command)
     end
   end
 
-  def run_with_time
-    result = $root.run(nil)
-    awesome_print result
-    return result
+  def run
+    @root.run(nil)
+  end
+
+  def export_tree(path = 'execution_tree')
+    @root.print_tree(path)
   end
 
 end

data/lib/tree_building/concurrent_node.rb

@@ -10,46 +10,20 @@ class ConcurrentNode < Node
 
     def run(instance)
         pids = []
-        totalTime =
-            {
-                :name => self.name,
-                :before => 0,
-                :exec => [],
-                :after => 0
-            }
-
-        start = Time.now
-        before_list.each do |before_command|
-          if instance.nil?
-            puts `"#{before_command}"`
-          else
-            $virtual_machines[instance].invoke [[before_command]]
-          end
-        end
-        finish = Time.now
+        init_time
 
-        totalTime[:before] = finish - start
+        before_exec(instance, @total_time)
 
         node_list.each do |node|
           pids << fork do
-            totalTime[:exec].push(node.run(instance))
+            @total_time[:exec].push(node.run(instance))
           end
         end
 
         pids.each{|pid| Process.waitpid(pid)}
 
-        start = Time.now
-        after_list.each do |after_command|
-          if instance.nil?
-            puts `"#{after_command}"`
-          else
-            $virtual_machines[instance].invoke [[after_command]]
-          end
-        end
-        finish = Time.now
-
-        totalTime[:after] = finish - start
-        return totalTime
+        after_exec(instance, @total_time)
+        return @total_time
     end
 
     def draw_block(graph)

data/lib/tree_building/execution_node.rb

@@ -9,23 +9,27 @@ class ExecutionNode < Node
     self.name = '[' + ExecutionNode.to_s + ']'
   end
 
+
+  def init_time
+    @total_time =
+        {
+            :name => @name,
+            :before => 0,
+            :exec => [],
+        }
+
+  end
+
   def draw_block(graph)
     graph.rect << graph.node(id)
     graph.node(id).label(name)
   end
 
+
   def run(instance)
-    totalTime =
-        {
-          :name => self.name,
-          :total => 0,
-          :before => 0,
-          :exec => {},
-          :after => 0
-        }
+    init_time
 
     start = Time.now
-
     commands.each_with_index do  |command, index|
       _start = Time.now
       if instance.nil?
@@ -34,12 +38,12 @@ class ExecutionNode < Node
         $virtual_machines[instance].invoke [[command]]
       end
       _finish = Time.now
-      totalTime[:exec]["#{index}. " + command] = _finish - _start
+      @total_time[:exec].push( {:cmd => command, :time => _finish - _start})
     end
     finish = Time.now
 
-    totalTime[:total] = finish - start
-    return totalTime
+    @total_time[:total] = finish - start
+    return @total_time
   end
 
 end

data/lib/tree_building/node.rb

@@ -19,15 +19,27 @@ class Node
     self.name = '[Node]'
   end
 
-  def run(instance)
-    totalTime =
+  def init_time
+    @total_time =
         {
-            :name => self.name,
-            :before => 0,
-            :exec => [],
-            :after => 0
+            :name => @name,
+            :exec => []
         }
 
+  end
+
+  def run(instance)
+    init_time
+    before_exec(instance, @total_time)
+    node_list.each do |node|
+      @total_time[:exec].push(node.run(instance))
+    end
+    after_exec(instance, @total_time)
+
+    return @total_time
+  end
+
+  def before_exec(instance, total_time)
     start = Time.now
     before_list.each do |before_command|
       if instance.nil?
@@ -38,12 +50,10 @@ class Node
     end
     finish = Time.now
 
-    totalTime[:before] = finish - start
-
-    node_list.each do |node|
-      totalTime[:exec].push(node.run(instance))
-    end
+    total_time[:before] = finish - start
+  end
 
+  def after_exec(instance, total_time)
     start = Time.now
     after_list.each do |after_command|
       if instance.nil?
@@ -53,10 +63,7 @@ class Node
       end
     end
     finish = Time.now
-
-    totalTime[:after] = finish - start
-
-    return totalTime
+    total_time[:after] = finish - start
   end
 
   def draw_block(graph)
@@ -107,11 +114,11 @@ class Node
     draw_after_blocks(node, graph)
   end
 
-  def print_tree
+  def print_tree(path)
     node = self
     digraph do
       node.paint(node, self)
-      save 'execution_graph', 'png'
+      save path, 'png'
     end
   end
 

data/lib/tree_building/on_node.rb

@@ -9,47 +9,17 @@ class OnNode < Node
   end
 
   def run(instance)
-    totalTime =
-        {
-            :name => self.name,
-            :before => 0,
-            :exec => [],
-            :after => 0
-        }
-    instance = @instance
-
-    start = Time.now
-    before_list.each do |before_command|
-      puts before_command
-      if instance.nil?
-        `#{before_command}`
-      else
-        $virtual_machines[instance].invoke [[before_command]]
-      end
-    end
-    finish = Time.now
-
-    totalTime[:before] = finish - start
+    init_time
 
+    before_exec(@instance, @total_time)
     node_list.each do |node|
       puts @instance
-      totalTime[:exec].push(node.run(@instance))
-    end
-
-
-    start = Time.now
-    after_list.each do |after_command|
-      if instance.nil?
-        `#{after_command}`
-      else
-        $virtual_machines[instance].invoke [[after_command]]
-      end
+      @total_time[:exec].push(node.run(@instance))
     end
-    finish = Time.now
 
-    totalTime[:after] = finish - start
+    after_exec(@instance, @total_time)
 
-    return totalTime
+    return @total_time
   end
 
   def draw_block(graph)

data/test/execution_test.rb

@@ -52,5 +52,4 @@ experiment 'Montage' do
     end
   end
 end
-#$root.run(0, nil)
-#$root.print_tree
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: claudius
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-05 00:00:00.000000000 Z
+date: 2014-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -120,7 +120,6 @@ files:
 - lib/tree_building/on_node.rb
 - test/execution_test.rb
 - test/gem_usage_test.rb
-- test/test.rb
 - test/test_local_execution.rb
 homepage: https://github.com/blostic/claudius
 licenses:
@@ -151,5 +150,4 @@ summary: Write a gem summary
 test_files:
 - test/execution_test.rb
 - test/gem_usage_test.rb
-- test/test.rb
 - test/test_local_execution.rb

data/test/test.rb

@@ -1,46 +0,0 @@
-require 'claudius'
-require "awesome_print"
-
-experiment_tree = experiment 'sdsdf' do
-  define_providers do
-    # cloud('aws', :provider => config['provider'],
-    #               :region=>config['region'],
-    #               :aws_access_key_id => config['aws_access_key_id'],
-    #               :aws_secret_access_key => config['aws_secret_access_key'])
-    # .create_instances(['t1.micro'], 'ubuntu', './Piotr-key-pair-irleand.pem',
-    #               :key_name => 'Piotr-key-pair-irleand',
-    #               :groups => 'Piotr-irleand')
-    manual('kali', '192.168.1.116', 'root', :password => 'toor', :port => 22)
-  end
-
-  foreach ['kali'] do |instance|
-    foreach ['a'] do |param|
-      before do
-      end
-      on instance do
-        execute 'install prerequisites' do
-          ssh "curl -O http://pegasus.isi.edu/montage/Montage_v3.3_patched_4.tar.gz"
-          ssh "tar zxvf Montage_v3.3_patched_4.tar.gz"
-          ssh "cd Montage_v3.3_patched_4"
-          ssh "make"
-          ssh "cd .."
-          ssh "git clone https://github.com/dice-cyfronet/hyperflow.git --depth 1 -b develop"
-          ssh "cd hyperflow"
-          ssh "npm install"
-          ssh "curl -O https://dl.dropboxusercontent.com/u/81819/hyperflow-amqp-executor.gem"
-          ssh "echo toor | sudo -S gem2.0 install --no-ri --no-rdoc hyperflow-amqp-executor.gem"
-        end
-        execute do
-          ssh "date"
-        end
-        execute do
-          ssh "echo #{param}"
-        end
-      end
-      after do
-      end
-    end
-  end
-end
-
-experiment_tree.run_with_time