panoramix 0.5.1 → 0.6

data/lib/panoramix/external.rb

@@ -14,7 +14,7 @@ def external(dep, &block)
   # Handle with MPI
   handled_dep = Panoramix::MPI.handle_external(dep.keys[0], params)
 
-  raise "Only a single external depdency supported (received: #{dep.keys})" if handled_dep.length != 1
+  raise "Only a single external dependency supported (received: #{dep.keys})" if handled_dep.length != 1
 
   # Select provided dependencies
   prerequisites = value.select { |d| ! d.is_a? Hash }

data/lib/panoramix/mpi.rb

@@ -22,7 +22,7 @@ module Panoramix
 
       def handle_external(key, value)
         # Get current scope
-        scope = Panoramix::current_host_name
+        scope = "local"
 
         # Save dependency into @project_mpi
         @project_mpi[scope] = {} if @project_mpi[scope].nil?

data/lib/panoramix/panoramix_core.rb

@@ -41,12 +41,14 @@ module Panoramix
 		end
 	end
 
-	def define_action_task(name, desctiption, instance, operation)
-		if instance.respond_to? operation
+	def define_action_task(name, desctiption, instance, action)
+		if instance.respond_to? action.name
 			Rake.application.last_description = desctiption
-			Rake::Task.define_task "#{name}:#{operation.to_s}" do |t|
-				run_custom_task(instance, operation)
+			Rake::Task.define_task "#{name}:#{action.name.to_s}" do |t|
+				run_custom_task(instance, action.name)
 			end
+
+			action.addTask("#{name}:#{action.name.to_s}", instance.class)
 		end
 	end
 
@@ -56,7 +58,6 @@ module Panoramix
 	end
 
 	def define_tasks(name, descriptions, instance, prerequisites, block=nil)
-		fill_current_host_tasks(name, instance.class)
 		action = Proc.new do |t|
 			run_task(t, instance, block) if block
 			run_task(t, instance) unless block
@@ -64,46 +65,14 @@ module Panoramix
 		end
 
 		define_task(name, prerequisites, descriptions[:main], action)
-		Panoramix::Tasks::Actions.each do |act|
-			define_action_task(name, descriptions[act.action_name.to_sym], instance, act.action_name)
-		end
-	end
-
-	def resolve_host_dependencies
-		current_host.class.deployable? ? :host : nil
-	end
-
-	def connection host_name
-		unless Panoramix::Connections[host_name]
-			host = Panoramix::Hosts[host_name][:instance]
-			Panoramix::Connections.register(host_name, host.connection_params)
-			Panoramix::Connections.connect host_name
-		end
-		Panoramix::Connections[host_name]
-	end
-
-	def current_host
-		Panoramix::Hosts[current_host_name][:instance]
-	end
 
-	def fill_current_host_tasks(name, type)
-		unless Panoramix::Hosts[current_host_name][:tasks][type]
-			 Panoramix::Hosts[current_host_name][:tasks][type] = []
+		Panoramix::Tasks::Actions.each do |act|
+			define_action_task(name, descriptions[act.name.to_sym], instance, act)
 		end
-		Panoramix::Hosts[current_host_name][:tasks][type].push(name)
-	end
-
-	def current_host_name
-		Rake.application.current_scope.first || "local"
 	end
 
 	def validation_error(instance, error)
 		puts "#{instance.class.name.split("::").last} validation error \n\t#{error.gsub("\n", "\n\t").red}"
 	end
 
-	def ip_host host_name
-		host = Panoramix::Hosts[host_name]
-		return !host.nil? ? host[:instance].ip : nil
-	end
-
 end

data/lib/panoramix/plugin/base.rb

@@ -1,4 +1,6 @@
-require "panoramix/locale"
+require 'panoramix/locale'
+require 'open3'
+require 'colorize'
 
 module Panoramix
 	module Plugin
@@ -7,10 +9,6 @@ module Panoramix
 
 		class Base
 
-			def initialize host
-				@host = host
-			end
-
 			# Return current timestamp
 			def timestamp
 				raise "Not implemented"
@@ -32,16 +30,45 @@ module Panoramix
 			end
 
 			def shell(cmd, silent=false, env=Hash.new)
-				# Get a connection for the current host
-				connection = Panoramix.connection(@host)
-				# Run the shell command
-				connection.shell(cmd, silent, env)
-			end
 
-			def shell_ready?
-				Panoramix.connection(@host).ready?
-			end
+	      puts "Running #{cmd}".magenta if ENV["VERBOSE"]
+
+	      @err = ""
+	      @out = ""
+	      Open3.popen3(env, cmd) do |stdin, stdout, stderr, wait_thr|
+	        stdin.close
+	        stdout.each_line do |line|
+	          puts line unless silent
+	          @out << "#{line}"
+	        end
+	        stderr.each_line do |line|
+	          puts line.red unless silent
+	          @err << "#{line}"
+	        end
+	        @exit_status = wait_thr.value
+	      end
+
+	      if ENV["VERBOSE"] && !@out.empty?
+	        puts "\tout => \n\t\t#{@out.gsub("\n","\n\t\t")}".green
+	      end
+	      if ENV["VERBOSE"] && !@err.empty?
+	        if @exit_status.success?
+	          puts "\terr => \n\t\t#{@err.gsub("\n","\n\t\t")}".yellow
+	        else
+	          puts "\terr => \n\t\t#{@err.gsub("\n","\n\t\t")}".red
+	        end
+	      end
+	      puts "\texit_status => #{@exit_status}\n".blue if ENV["VERBOSE"]
+
+	      raise @err unless @exit_status.success?
 
+	      return {
+	        :out => @out,
+	        :err => @err,
+	        :exit_status => @exit_status
+	      }
+	    end
+	    
 		end
 	end
 end

data/lib/panoramix/plugin/docker_build.rb

@@ -7,8 +7,8 @@ module Panoramix
 
       attr_reader :src
 
-      def initialize(dst, src, host)
-        super(dst, host)
+      def initialize(dst, src)
+        super(dst)
         @src = src
       end
 
@@ -28,9 +28,6 @@ module Panoramix
         super ("Built image")
       end
 
-      def validate
-      end
-
     end
 
   end
@@ -65,16 +62,9 @@ def docker_build(args, &block)
 
   # Merge prerequisites with the Dockerfile file_task
   prerequisites = prerequisites.push(dockerfile) unless dockerfile.nil?
-
-  # Set host as a new prerequisite if needed
-  host_dep = Panoramix.resolve_host_dependencies
-  prerequisites = prerequisites.push(host_dep) unless host_dep.nil?
   prerequisites.flatten!
 
-  # Get hostname for this scope
-  host = Panoramix.current_host_name
-
-  instance = Panoramix::Plugin::DockerBuild.new(name, dockerfile, host)
+  instance = Panoramix::Plugin::DockerBuild.new(name, dockerfile)
 
   descriptions = I18n.t('docker_build')
   descriptions = Hash.new if descriptions.class != Hash

data/lib/panoramix/plugin/docker_image.rb

@@ -7,8 +7,8 @@ module Panoramix
 
 			attr_reader :src
 
-			def initialize(dst, src, host)
-				super(dst, host)
+			def initialize(dst, src)
+				super(dst)
 				@src = src
 			end
 
@@ -17,16 +17,6 @@ module Panoramix
 				true
 			end
 
-			# Action clobber for this task
-			def clobber
-				super
-				info = created?
-        if info
-          id = info.split(" ")[2]
-          shell "docker rmi -f #{id}"
-        end
-			end
-
 			# Default action for this task
 			def run_default
 				shell "docker pull #{@src}" unless ENV["NO_PULL"]
@@ -51,14 +41,7 @@ def external_docker_image(args, block)
 
 	prerequisites = []
 
-	# Set host as a new prerequisite if needed
-	host_dep = Panoramix.resolve_host_dependencies
-	prerequisites = prerequisites.push(host_dep) unless host_dep.nil?
-
-	# Get hostname for this scope
-	host = Panoramix.current_host_name
-
-	instance = Panoramix::Plugin::DockerImage.new(name, src, host)
+	instance = Panoramix::Plugin::DockerImage.new(name, src)
 
 	descriptions = I18n.t('docker_image')
 	descriptions = Hash.new if descriptions.class != Hash

data/lib/panoramix/plugin/docker_image_base.rb

@@ -8,8 +8,7 @@ module Panoramix
 
       attr_reader :dst
 
-      def initialize(dst, host)
-        super host
+      def initialize(dst)
         @dst = dst
         @tag = "latest"
       end
@@ -30,9 +29,15 @@ module Panoramix
       # Has this image already been created
       def created?
         return @created if @created
-        return nil unless shell_ready?
-        info = shell("docker images | grep -w '^#{@dst}' | grep -w '#{@tag}'", true)[:out]
-        @created = info = info.empty? ? nil: info
+        
+        info = shell("docker images", true)[:out]
+
+        images_list = info.split("\n")
+        images_list.shift
+
+        image_info = images_list.select {|img| img.match(/#{@dst}\s+#{@tag}/) }
+
+        @created = info = info.empty? ? nil: image_info[0]
       end
 
       # Action clobber for this task

data/lib/panoramix/plugin/docker_up.rb

@@ -12,8 +12,7 @@ module Panoramix
 			attr_reader :src
 			attr_reader :env
 
-			def initialize(dst, src, env, host)
-				super (host)
+			def initialize(dst, src, env)
 				@dst = dst
 				@src = src
 				@env = env
@@ -33,11 +32,15 @@ module Panoramix
 
 			# Has this image already been created
 			def created?
-				return nil unless shell_ready?
 				info = shell("docker-compose -p #{@dst} -f #{@src} ps -q", true, @env)[:out]
 				@created = info = info.empty? ? nil: info
 			end
 
+			# Action rm for this task
+			def rm
+				clobber
+			end
+
 			# Action clobber for this task
 			def clobber
 				shell("docker-compose -p #{@dst} -f #{@src} kill; docker-compose -p #{@dst} -f #{@src} rm -v --force", false, @env) if created?
@@ -104,21 +107,6 @@ module Panoramix
 				end
 				puts
 	    end
-
-			def validate
-				keys_errors = ""
-				@env.each do |key, value|
-					if value.nil?
-						keys_errors << "#{key} " if Panoramix::Link[key].nil?
-					end
-				end
-
-				if keys_errors != ""
-					message = I18n.t('errors.docker_up.env_var_not_given', {:env => keys_errors})
-					raise(ValidationError, message)
-				end
-			end
-
 		end
 
 	end
@@ -162,14 +150,7 @@ def docker_up(args, &block)
 	prerequisites = deps.select { |d| ! d.is_a? Hash }
 	prerequisites = prerequisites.push(compose)
 
-	# Set host as a new prerequisite if needed
-	host_dep = Panoramix.resolve_host_dependencies
-	prerequisites = prerequisites.push(host_dep) unless host_dep.nil?
-
-	# Get hostname for this scope
-	host = Panoramix.current_host_name
-
-	instance = Panoramix::Plugin::DockerUp.new(name, compose, environment, host)
+	instance = Panoramix::Plugin::DockerUp.new(name, compose, environment)
 
 	descriptions = I18n.t('docker_up')
 	descriptions = Hash.new if descriptions.class != Hash

data/lib/panoramix/plugin/git.rb

@@ -9,8 +9,7 @@ module Panoramix
 			attr_reader :src
 			attr_reader :tag
 
-			def initialize(dst, src, tag, host)
-				super host
+			def initialize(dst, src, tag)
 				# Get git project name
 			  repo_name=src.split("/").last.gsub(".git", "")
 
@@ -74,15 +73,7 @@ module Panoramix
 		    # Switch to tag
 		    shell "git -C #{@dst} checkout #{@tag}"
 			end
-
-			def validate
-				out = shell("git ls-remote #{@src} | grep \'#{@tag}$\' | wc -l", true)
-				if (! out[:exit_status].success? || out[:out] =~ /0/)
-					 message = I18n.t('errors.git.not_found', {:branch => @src, :tag => @tag})
-          raise(ValidationError, message) 
-				end
-			end
-
+			
 		end
 	end
 end
@@ -95,11 +86,8 @@ def git(args, prerequisites, block=nil)
 	# Get :tag value from arguments
 	tag = args.values[0][:tag]
 
-	# Git tasks always run as local
-	host = "local"
-
 	# Generate a new instance using the provided arguments
-	instance = Panoramix::Plugin::Git.new(name, src, tag, host)
+	instance = Panoramix::Plugin::Git.new(name, src, tag)
 
 	descriptions = I18n.t('git')
 	descriptions = Hash.new if descriptions.class != Hash

data/lib/panoramix/plugin/s3.rb

@@ -9,8 +9,7 @@ module Panoramix
 			attr_reader :src
 			attr_reader :flags
 
-			def initialize(dst, src, flags, host)
-				super host
+			def initialize(dst, src, flags)
 				@dst = dst
 				@src = src
 				@flags = flags
@@ -47,15 +46,7 @@ module Panoramix
 			def run_default
 				shell "aws s3 cp #{@flags} #{@src} #{@dst}"
 			end
-
-			def validate
-				out = shell("aws s3 cp --dryrun #{@flags} #{@src} #{@dst}" , true)
-				if (! out[:exit_status].success?)
-					message = I18n.t('errors.s3.not_found', {:uri => @src})
-					raise(ValidationError, message)
-				end
-			end
-
+			
 		end
 	end
 end
@@ -69,10 +60,7 @@ def s3(args, prerequisites, block=nil)
 	# Provided flags
 	flags = args.values[0][:flags]
 
-	# S3 tasks always run as local
-	host = "local"
-
-	instance=Panoramix::Plugin::S3.new(name, src, flags, host)
+	instance=Panoramix::Plugin::S3.new(name, src, flags)
 
 	descriptions = I18n.t('s3')
 	descriptions = Hash.new if descriptions.class != Hash

data/lib/panoramix/plugin/wget.rb

@@ -9,8 +9,7 @@ module Panoramix
 			attr_reader :src
 			attr_reader :flags
 
-			def initialize(dst, src, flags, host)
-				super host
+			def initialize(dst, src, flags)
 				@dst = dst
 				@src = src
 				@flags = flags
@@ -44,20 +43,11 @@ module Panoramix
 			def run_default
 				shell "wget -nv #{@flags} #{@src} -O #{@dst}"
 			end
-
-			def validate
-				out = shell("wget #{@flags} --spider -S #{@src}", true)
-				if (! out[:exit_status].success?)
-					message = I18n.t('errors.wget.not_found', {:uri => @src})
-					raise(ValidationError, message) 
-				end
-			end
-
+			
 		end
 	end
 end
 
-
 def wget(args, prerequisites, block=nil)
 	# Task name
 	name = args.keys[0]
@@ -66,10 +56,7 @@ def wget(args, prerequisites, block=nil)
 	# Provided flags
 	flags = args.values[0][:flags]
 
-	# Wget tasks always run as local
-	host = "local"
-
-	instance=Panoramix::Plugin::Wget.new(name, src, flags, host)
+	instance=Panoramix::Plugin::Wget.new(name, src, flags)
 
 	descriptions = I18n.t('wget')
 	descriptions = Hash.new if descriptions.class != Hash

data/lib/panoramix/tasks/actions.rb

@@ -2,23 +2,29 @@ module Panoramix
   module Tasks
 
     class Action
-      attr_reader :action_name
+      attr_reader :name
       attr_reader :silent
       attr_reader :order_class
+      attr_reader :tasks
 
       def initialize(action_name, silent, order_class)
-        @action_name = action_name
+        @name = action_name
         @silent = silent
         @order_class = order_class
+        @tasks = []
+      end
+
+      def addTask(name, instance_type)
+        @tasks.push Hash[:name => name, :instance_type => instance_type]
       end
 
     end
 
     Actions = Array.new
-    Actions.push(Action.new("validate", true,	[Plugin::DockerUp, Plugin::Wget, Plugin::Git, Plugin::DockerBuild, Plugin::S3]))
-    Actions.push(Action.new("ps", false,	[Plugin::Provision, Plugin::DockerImage, Plugin::DockerBuild, Plugin::DockerUp]))
+    Actions.push(Action.new("ps", false,	[Plugin::DockerUp]))
+    Actions.push(Action.new("rm", false,  [Plugin::DockerUp]))
     Actions.push(Action.new("logs", false,	[Plugin::DockerUp]))
-    Actions.push(Action.new("clobber", false,	[Plugin::DockerUp, Plugin::DockerBuild,	Plugin::DockerImage, Plugin::Provision]))
+    Actions.push(Action.new("clobber", false,	[Plugin::DockerUp, Plugin::DockerBuild,	Plugin::DockerImage]))
     Actions.push(Action.new("clean", true, [Plugin::Wget, Plugin::Git, Plugin::S3]))
     Actions.push(Action.new("stop", false, [Plugin::DockerUp]))
     Actions.push(Action.new("start", false, [Plugin::DockerUp]))

data/lib/panoramix/tasks/global_tasks.rb

@@ -0,0 +1,26 @@
+module Panoramix
+  module Tasks
+    module GlobalTasks
+      module_function
+
+      def define_tasks
+        descriptions = I18n.t('global')
+        Panoramix::Tasks::Actions.each do |action|
+
+          block = Proc.new  do |t|
+            action.order_class.each do |type| 
+              action.tasks.each do |task|
+                if task[:instance_type].to_s == type.to_s
+                  Rake::Task[task[:name]].invoke
+                end
+              end
+            end
+          end
+
+          Panoramix.define_task(action.name, [], descriptions[action.name.to_sym], block)
+        end
+      end
+
+    end
+  end
+end

data/lib/panoramix.rb

@@ -2,48 +2,47 @@ require "panoramix/external"
 require "panoramix/plugin/docker_image"
 require "panoramix/plugin/docker_build"
 require "panoramix/plugin/docker_up"
-require "panoramix/plugin/provision"
 require "panoramix/dsl"
-require "panoramix/hosts"
-require "panoramix/connections"
 require "panoramix/panoramix_core"
 require "panoramix/tasks/actions"
-require "panoramix/tasks/common_host_tasks"
 require "panoramix/tasks/task_mpi"
+require "panoramix/tasks/global_tasks"
 require "rake/clean"
+require 'git'
+require 'colorize'
 
-Panoramix::MPI.initialize
-
-Panoramix::Connections.initialize
-Panoramix::Hosts.initialize
-Panoramix::TIMESTAMP=Hash.new
+def load_env_variables current_dir
+	g = Git.open current_dir
+	current_branch = g.current_branch
+	current_project_url = g.remote.url.split(":").last.split("/")[-2..-1].join("/")
+	env_file_path = File.join(current_dir, 'env.rb')
+	tries = 0
+	begin
+		system "aws s3 cp s3://safelayer-env-#{current_branch}/#{current_project_url}/env.rb #{env_file_path}"
+		raise unless $?.exitstatus == 0
+		load env_file_path
+	rescue
+  	tries += 1
+		sleep 1
+  	retry if tries < 3
+  	raise "Error downloading file s3://safelayer-env-#{current_branch}/#{current_project_url}/env.rb"
+	end
+end
 
-class String
-	def black;          "\033[30m#{self}\033[0m" end
-	def red;            "\033[31m#{self}\033[0m" end
-	def green;          "\033[32m#{self}\033[0m" end
-	def brown;          "\033[33m#{self}\033[0m" end
-	def blue;           "\033[34m#{self}\033[0m" end
-	def magenta;        "\033[35m#{self}\033[0m" end
-	def cyan;           "\033[36m#{self}\033[0m" end
-	def gray;           "\033[37m#{self}\033[0m" end
-	def bg_black;       "\033[40m#{self}\033[0m" end
-	def bg_red;         "\033[41m#{self}\033[0m" end
-	def bg_green;       "\033[42m#{self}\033[0m" end
-	def bg_brown;       "\033[43m#{self}\033[0m" end
-	def bg_blue;        "\033[44m#{self}\033[0m" end
-	def bg_magenta;     "\033[45m#{self}\033[0m" end
-	def bg_cyan;        "\033[46m#{self}\033[0m" end
-	def bg_gray;        "\033[47m#{self}\033[0m" end
-	def bold;           "\033[1m#{self}\033[22m" end
-	def reverse_color;  "\033[7m#{self}\033[27m" end
+def check_env_variables env_vars
+	env_vars = [ env_vars ] if env_vars.class == String
+	env_vars.each do |env_var|
+		if ! ENV[env_var]
+			puts "error: #{env_var} environment variable not set".red
+			exit 1
+		end
+	end
 end
 
-Panoramix::Tasks::CommonHostTasks.define_tasks
+Panoramix::MPI.initialize
+Panoramix::TIMESTAMP = Hash.new
+Panoramix::Tasks::GlobalTasks.define_tasks
 Panoramix::Tasks::MpiInfo.define_tasks
 Panoramix::Tasks::MpiGen.define_task
-Panoramix::Link = Hash.new
 
 Rake::Task.tasks.select{|t| t.name == "clobber"}.first.instance_variable_set(:@prerequisites,[])
-
-at_exit { Panoramix::Connections.connections.each {|k,v| v.close_connection } }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: panoramix
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: '0.6'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-11 00:00:00.000000000 Z
+date: 2015-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -75,41 +75,61 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: git
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Panoramix is a Rakefile like lib, capable of handling docker deployments
 email: jig@safelayer.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/panoramix/dsl.rb
-- lib/panoramix/tasks/common_host_tasks.rb
-- lib/panoramix/tasks/task_mpi.rb
-- lib/panoramix/tasks/actions.rb
+- lib/panoramix.rb
+- lib/panoramix/locale.rb
 - lib/panoramix/plugin/docker_image.rb
-- lib/panoramix/plugin/base.rb
-- lib/panoramix/plugin/docker_image_base.rb
 - lib/panoramix/plugin/docker_up.rb
-- lib/panoramix/plugin/docker_build.rb
-- lib/panoramix/plugin/provision.rb
 - lib/panoramix/plugin/s3.rb
 - lib/panoramix/plugin/git.rb
+- lib/panoramix/plugin/base.rb
+- lib/panoramix/plugin/docker_build.rb
+- lib/panoramix/plugin/docker_image_base.rb
 - lib/panoramix/plugin/wget.rb
-- lib/panoramix/hosts.rb
-- lib/panoramix/connections.rb
-- lib/panoramix/connections/local_connection.rb
-- lib/panoramix/connections/base_connection.rb
-- lib/panoramix/connections/docker_connection.rb
-- lib/panoramix/locale.rb
-- lib/panoramix/mpi.rb
-- lib/panoramix/metal.rb
+- lib/panoramix/dsl.rb
 - lib/panoramix/external.rb
-- lib/panoramix/instances/base.rb
-- lib/panoramix/instances/local.rb
-- lib/panoramix/instances/metal.rb
-- lib/panoramix/instances/aws.rb
-- lib/panoramix/aws.rb
+- lib/panoramix/tasks/task_mpi.rb
+- lib/panoramix/tasks/global_tasks.rb
+- lib/panoramix/tasks/actions.rb
+- lib/panoramix/mpi.rb
 - lib/panoramix/panoramix_core.rb
-- lib/panoramix.rb
 - locales/en.yml
 homepage: https://github.com/sflyr
 licenses:

data/lib/panoramix/aws.rb

@@ -1,13 +0,0 @@
-require "panoramix/instances/aws"
-
-module Panoramix
-
-  module AWS
-    module_function
-
-    def config(config)
-      AwsInstance.new(config.getHash)
-    end
-  end
-
-end

data/lib/panoramix/connections/base_connection.rb

@@ -1,49 +0,0 @@
-require 'open3'
-
-module Panoramix
-  class BaseConnection
-
-    def shell(cmd, silent, env)
-
-      env.select{|k,v| v.nil?}.each{ |k, v| env[k]=Panoramix.ip_host(Panoramix::Link[k]) }
-      puts "Running #{cmd}".magenta if ENV["VERBOSE"]
-
-      @err = ""
-      @out = ""
-      Open3.popen3(env, cmd) do |stdin, stdout, stderr, wait_thr|
-        stdin.close
-        stdout.each_line do |line|
-          puts line unless silent
-          @out << "#{line}"
-        end
-        stderr.each_line do |line|
-          puts line.red unless silent
-          @err << "#{line}"
-        end
-        @exit_status = wait_thr.value
-      end
-
-      if ENV["VERBOSE"] && !@out.empty?
-        puts "\tout => \n\t\t#{@out.gsub("\n","\n\t\t")}".green
-      end
-      if ENV["VERBOSE"] && !@err.empty?
-        if @exit_status.success?
-          puts "\terr => \n\t\t#{@err.gsub("\n","\n\t\t")}".brown
-        else
-          puts "\terr => \n\t\t#{@err.gsub("\n","\n\t\t")}".red
-        end
-      end
-      puts "\texit_status => #{@exit_status}\n".blue if ENV["VERBOSE"]
-
-      return {
-        :out => @out,
-        :err => @err,
-        :exit_status => @exit_status
-      }
-    end
-
-    def close_connection
-    end
-
-  end
-end

data/lib/panoramix/connections/docker_connection.rb

@@ -1,85 +0,0 @@
-require 'time'
-require 'net/ssh/gateway'
-require 'panoramix/connections/base_connection'
-
-
-module Panoramix
-  class DockerConnection < BaseConnection
-
-    def initialize(host, user)
-      @host = host
-      @user = user
-      @connected = false
-    end
-
-    def connected?
-      @connected
-    end
-
-    def connect
-      return if @connected
-      return unless @host && @user
-      ready?
-    end
-
-    # Returns true if connection is enabled
-    def ready?
-      return false unless @host && @user
-      ! open_tunnel.nil?
-    end
-
-    def shell(cmd, silent=false, env=Hash.new)
-      raise "No host unless" unless @host && @user
-      #open_tunnel unless @gateway
-      # Run passing tunneled port
-      env['DOCKER_HOST'] = "tcp://127.0.0.1:#{@port}"
-      super(cmd, silent, env)
-    end
-
-    def close_connection
-      if @connected
-        @gateway.close(@port)
-        @connected = false
-        @gateway = nil
-        @port = nil
-      end
-    end
-
-    private
-
-    def open_tunnel
-      unless @gateway
-        # Open a new ssh tunnel
-        print "Connecting remote host..."
-        # Wait until docker starts
-        Timeout::timeout(600) do
-          begin
-            @gateway = Net::SSH::Gateway.new(@host, @user)
-            3.times do
-              begin
-                @port = @gateway.open('127.0.0.1', 666, rand(63000)+2000)
-                break
-              rescue
-                puts "Port already in use"
-              end
-            end
-            #Check this connection
-            Timeout::timeout(10) do
-              res = shell("docker ps", true)
-              raise "Servide docker not available" unless res[:exit_status].success?
-            end
-          rescue Exception => err
-            sleep(10)
-            print "."
-            @gateway.close(@port) if @gateway
-            retry
-          end
-        end
-        @connected = true
-        puts " done."
-      end
-      @gateway
-    end
-
-  end
-end

data/lib/panoramix/connections/local_connection.rb

@@ -1,15 +0,0 @@
-require 'panoramix/connections/base_connection'
-
-module Panoramix
-
-  class LocalConnection < BaseConnection
-    def shell(cmd, silent, env )
-      res = super(cmd, silent, env)
-    end
-
-    def ready?
-      return true
-    end
-  end
-
-end

data/lib/panoramix/connections.rb

@@ -1,28 +0,0 @@
-require 'panoramix/connections/local_connection'
-require 'panoramix/connections/docker_connection'
-
-module Panoramix
-
-  class Connections
-    class << self
-        attr_reader :connections
-
-      	def initialize
-      		@connections=Hash.new
-      		@connections["local"] = LocalConnection.new
-      	end
-
-      	def register(host, config)
-          @connections[host] = DockerConnection.new(config[:host], config[:user])
-      	end
-
-        def connect key
-          @connections[key].connect unless @connections[key].connected?
-        end
-
-      	def [](key)
-          	@connections[key]
-        end
-      end
-  end
-end

data/lib/panoramix/hosts.rb

@@ -1,58 +0,0 @@
-require "panoramix/instances/local"
-
-module Panoramix
-  class Hosts
-    class << self
-
-      attr_reader :hosts
-
-    	def initialize
-    		@hosts=Hash.new
-    		register("local",  LocalInstance.new)
-    	end
-
-    	def register(name, instance)
-        if instance.class.ancestors.include? BaseInstance
-          instance.host(name)
-          @hosts[name] = {instance: instance, tasks: {}}
-          define_tasks(name)
-        else
-          puts "Warning using obsolete instance on host key
-            \t => host <host_name>, #{"<environment_class>".bold} \n\tchange to:
-            \t => host <host_name>, #{"Panoramix::<Cloud>.config(<environment_class>)".bold}
-            \t where Cloud must be AWS or Metal".red
-          exit(1)
-        end
-    	end
-
-      def define_tasks(name)
-        Panoramix::Tasks::Actions.each do |act|
-          block_act = custom_host_action(act.action_name, act.order_class, name)
-          descriptions =(name != 'local') ? I18n.t('host') : Hash.new
-          Panoramix.define_task("#{name}:#{act.action_name}", [], descriptions[act.action_name.to_sym], block_act)
-        end
-      end
-
-      def custom_host_action(action, class_order, host_name)
-        Proc.new do |t|
-          tasks = Panoramix::Hosts[host_name][:tasks]
-          class_order.each do |p|
-            tasks[p].each do |task_name|
-              host_name2 =(host_name != 'local') ? "#{host_name}:" : ""
-              Rake::Task["#{host_name2}#{task_name}:#{action}"].invoke
-            end  if tasks[p]
-          end
-        end
-      end
-
-    	def [](key)
-        	@hosts[key]
-      end
-
-      def to_s
-        @hosts.pretty_inspect
-      end
-
-    end
-  end
-end

data/lib/panoramix/instances/aws.rb

@@ -1,74 +0,0 @@
-require "raws"
-require "panoramix/instances/base"
-
-module Panoramix
-
-  class AwsInstance < BaseInstance
-
-    attr_reader :machine
-
-    def initialize(config)
-      @tunnel=nil
-      @machine = Raws::EC2::Machine.new(config[:name], config[:region])
-      @machine.config = config
-      @record = Raws::Route53::Record.new(config[:subdomain_id], config[:region])
-    end
-
-    def host(host)
-      @id=host
-      @machine.config[:name] = host
-      @record.name = host
-    end
-
-    def status
-      puts @machine.status
-    end
-
-    def deployed?
-      @machine.deployed?
-    end
-
-    def timestamp
-      @machine.timestamp
-    end
-
-    def run_instance args = {}
-      @machine.config.merge!(args)
-      if (@machine.config[:create_dns_record])
-        @record.ips.push(@machine.public_ip) #TODO: Wrong if private dns in aws => change for ip
-        @record.save
-      end
-      @machine.save
-      clear_known_hosts_by_hostid
-    end
-
-    def terminate_instance args=nil
-      @machine.terminate_instance
-      @record.delete if (@machine.config[:create_dns_record])
-    end
-
-    def self.deployable?
-      true
-    end
-
-    def connection_params
-      {:user => "ubuntu", :host => ip}
-    end
-
-    def ip
-      if @machine.config[:use_public_ip]
-        @ip = @machine.public_ip unless @ip
-      else
-        @ip = @machine.private_ip unless @ip
-      end
-      @ip
-    end
-    private
-
-    def clear_known_hosts_by_hostid
-      result = `ssh-keygen -R #{ip} 2>&1`
-      raie ("Failed to update known_host file. \n#{result}") if !result.include? "updated"
-    end
-
-  end
-end

data/lib/panoramix/instances/base.rb

@@ -1,13 +0,0 @@
-module Panoramix
-  class BaseInstance
-
-    def host(host)
-      @host = host
-    end
-
-    def ip
-      @host
-    end
-
-  end
-end

data/lib/panoramix/instances/local.rb

@@ -1,24 +0,0 @@
-require "panoramix/instances/base"
-
-module Panoramix
-
-  class LocalInstance < BaseInstance
-    def deployed?
-      true
-    end
-
-    def status
-      ""
-    end
-
-    def ip
-      "127.0.0.1"
-    end
-
-    def self.deployable?
-      false
-    end
-
-  end
-
-end

data/lib/panoramix/instances/metal.rb

@@ -1,26 +0,0 @@
-require "panoramix/instances/base"
-
-module Panoramix
-
-  class MetalInstance < BaseInstance
-    def initialize(user)
-      @tunnel = nil
-      @user = user
-    end
-
-    def connection_params
-        {:user => @user, :host => @host}
-    end
-
-    def deployed?
-      `ping -c 1 #{@host}`
-       $?.exitstatus == 0
-    end
-
-    def self.deployable?
-      false
-    end
-
-  end
-
-end

data/lib/panoramix/metal.rb

@@ -1,13 +0,0 @@
-require "panoramix/instances/metal"
-
-module Panoramix
-
-  module Metal
-    module_function
-
-    def config(user)
-      MetalInstance.new(user)
-    end
-  end
-
-end

data/lib/panoramix/plugin/provision.rb

@@ -1,95 +0,0 @@
-require "panoramix/plugin/base"
-
-module Panoramix
-	module Plugin
-		class Provision < Base
-
-			attr_reader :host
-			attr_accessor :config
-
-			def initialize(host, config)
-				super host
-				@host = host
-				@config = config
-			end
-
-			# Return current timestamp
-			def timestamp
-				if created?
-	        @host.timestamp
-	      else
-	        Time.at 0
-      	end
-			end
-
-			# When this instance needs to be executed
-			def needed? timestamps
-				!created?
-			end
-
-			# Has this instance already been created
-			def created?
-				@host.deployed?
-			end
-
-			# Action clobber for this task
-			def clobber
-				terminate_instance
-			end
-
-			 # Run a new instance
-	    def run_instance args
-	      @host.run_instance args
-	    end
-
-			# Terminate instance
-	    def terminate_instance args=nil
-	      unless args
-	        args=@config
-	      end
-
-	      @host.terminate_instance args
-	    end
-
-			# Default action for this task
-			def run_default
-				raise "Machine already created" if created?
-				run_instance @config
-			end
-
-			# Get aws status
-			def ps
-		    	if created?
-	          		puts "Timestamp: #{timestamp}"
-					puts @host.status
-				else
-					puts "Timestamp: Not created"
-				end
-				puts
-			end
-
-
-		end
-	end
-end
-
-
-def provision(&block)
-
-	raise "Provision defined outside an scope" unless Rake.application.current_scope.any?
-
-	# Get host for this task
-	name = Rake.application.current_scope.first
-
-	# Get host for this task
-	host = Panoramix::Hosts[name][:instance]
-
-	instance = Panoramix::Plugin::Provision.new(host, host.machine.config)
-
-	descriptions = I18n.t('provision')
-	descriptions = Hash.new if descriptions.class != Hash
-
-	prerequisites = []
-
-	Panoramix.define_tasks(:host, descriptions, instance, prerequisites, block)
-end

data/lib/panoramix/tasks/common_host_tasks.rb

@@ -1,44 +0,0 @@
-module Panoramix
-	module Tasks
-		module CommonHostTasks
-			module_function
-
-			# puts_header writes a formatted name to stdout
-			def puts_header host
-				docker_host = "(#{ENV["DOCKER_HOST"]})" if ENV["DOCKER_HOST"] && host == "localhost"
-
-				puts ""
-				head = "- #{host} #{docker_host} -"
-				(head.length - 1).times {print "-"}
-				puts "-"
-				puts head
-				(head.length - 1).times {print "-"}
-				puts "-\n\n"
-			end
-
-			# define_task defines the main ps task
-			def define_common_task(action, description, silent=false)
-				# Task body
-
-				block = Proc.new  do |t|
-
-					Panoramix::Hosts.hosts.each do |k, v|
-						puts_header k if((k != "localhost") && (!silent && (k != "localhost")))
-						Rake::Task["#{k}:#{action}"].invoke
-					end
-				end
-
-				# Define the ps task
-				Panoramix.define_task(action, [], description, block)
-			end
-
-			def define_tasks
-				descriptions = I18n.t('global')
-				Panoramix::Tasks::Actions.each do |act|
-					define_common_task(act.action_name, descriptions[act.action_name.to_sym], act.silent)
-				end
-			end
-
-		end
-	end
-end