mccloud 0.0.13 → 0.0.14

data/lib/mccloud/template.rb

@@ -0,0 +1,74 @@
+module Mccloud
+  class Template
+    attr_accessor :file
+    attr_accessor :erb
+    attr_accessor :params
+    attr_accessor :author
+    attr_accessor :bootstrap
+
+    attr_accessor :name
+    attr_accessor :env
+
+    def initialize(name,env)
+      @name=name
+      @env=env
+
+      @erb=true
+      @file=nil
+      @params=Hash.new
+      @author="No author specified"
+      @bootstrap=nil
+    end
+
+    def path
+      File.join(@env.config.templates.path,@name)
+    end
+
+    def exists?
+      File.directory?(self.path)
+    end
+
+    # Bindings in ERB http://www.stuartellis.eu/articles/erb/
+    # Links:
+    # * Trimming whitespace in ERB
+    # http://blade.nagaokaut.ac.jp/cgi-bin/scat.rb/ruby/ruby-talk/242656
+    # * Appending to ERB output
+    # http://blog.jayfields.com/2007/01/appending-to-erb-output-from-block.html
+    def comment(flag)
+      cur_pos=@output.length
+      yield
+      new_pos=@output.length
+      if flag
+
+        # Extraxt the block
+        block_text=@output[cur_pos..new_pos]
+
+        # Remove the block
+        @output[cur_pos..new_pos]=''
+
+        # Comment the block, with leading spaces into account
+        block_text.gsub!(/^(\s)*/,'\1# ')
+
+        # Re-insert the block
+        @output=@output.insert cur_pos, block_text
+      end
+
+    end
+
+    def to_s
+      "Template #{name}"
+    end
+
+    def to_template(vm_name="noname")
+      result=""
+      filename=@file
+      env.logger.info "Opening template file #{@file}"
+      if File.exists?(filename)
+        template=File.new(filename).read
+        result=ERB.new(template,nil,"-","@output").result(binding)
+      end
+      return result
+    end
+
+  end
+end

data/lib/mccloud/templates/Mccloudfile.erb

@@ -1,46 +1,219 @@
 Mccloud::Config.run do |config|
-  # All Mccloud configuration is done here. For a detailed explanation
-  # and listing of configuration options, please view the documentation
-  # online.
-
-  config.mccloud.prefix="<%= mcPrefix %>"
-  config.mccloud.environment="<%= mcEnvironment %>"
-  config.mccloud.identity="<%= mcIdentity %>"
-
-  config.vm.define "<%= serverName %>" do |<%= serverName %>_config|
-    <%= serverName %>_config.vm.provider="<%= providerId %>"
-
-    #<%= serverName %>_config.vm.provisioner=:chef_solo
-    #<%= serverName %>_config.vm.provisioner=:puppet
-    <%= serverName %>_config.vm.provider_options={ 
-      # ID = "<%= imageId%>" = <%= imageDescription %>
-      :image_id => "<%= imageId %>" , 
-      :flavor_id => "<%= flavorId %>",
-      :groups => %w(<%= securityGroup %>),
-      :key_name => "<%= keyName %>",
-      :availability_zone => "<%= availabilityZone %>" 
-    }
-	#Forward 80 remote to localport 8080
-    <%= serverName %>_config.vm.forward_port("http", 8080, 80)
-    <%= serverName %>_config.vm.user="<%= userName %>"
-    <%= serverName %>_config.vm.bootstrap="<%= bootstrapScript %>"
-    <%= serverName %>_config.vm.private_key="<%= privateKeyPath %>"
-    <%= serverName %>_config.vm.public_key="<%= publicKeyPath %>"
 
+  #############################################################
+  ## ** Provider Section ** - list alls keys to be used
+  #############################################################
+
+  ######
+  ## Example Amazon provider
+  ## Defines a provider called aws-us-east
+  ## Note 1: specify a provider with a different name for each region you need
+  ## Note 2: you need to have a valid .fog file with the correct key and secret-key
+
+  config.provider.define "aws-us-east" do |provider_config|
+    provider_config.provider.flavor = :aws
+
+    #Note: this are option provided to fog for creation
+    provider_config.provider.options = { }
+
+    # Region in which to create the VM
+    provider_config.provider.region = "us-east-1"
+
+    ## Check if necessary keypairs exist
+    ## To speed things up, set it to false
+    provider_config.provider.check_keypairs = true
+
+    ## Disable check if required security groups exist
+    ## To speed things up, set it to false
+    provider_config.provider.check_security_groups = true
+
+    ## If you share an amazon account with multiple people
+    ## You can use namespaces to separate resources
+    ## All resources will take this prefix 
+    provider_config.provider.namespace = "mccloud-development"
   end
 
-  ### Provisioners
-  config.vm.provision :puppet do |puppet|
-    puppet.pp_path = "/tmp/vagrant-puppet"
-    #puppet.manifests_path = "puppet/manifests"
-    #puppet.module_path = "puppet/modules"
-    puppet.manifest_file = "newbox.pp"
+  ######
+  ## Generic provider to manage host reachable by ssh
+  config.provider.define "hosts" do |provider_config|
+    provider_config.provider.flavor = :host
   end
 
-  config.vm.provision :chef_solo do |chef|
-     chef.cookbooks_path = ["<your cookboopath>"]
-     chef.add_recipe("<some recipe>")
-     # You may also specify custom JSON attributes:
-     chef.json.merge!({})
+  #############################################################
+  ## ** Key Section ** - list alls keys to be used
+  #############################################################
+  ## Default is :
+  ## - keyname = mccloud
+  ## - location = in $HOME directory
+  ## - private key_path =  $HOME/mccloud_rsa
+  ## - public key_path =  $HOME/mccloud_rsa.pub
+  ##
+  ## Note 1: keys can be generated with '$ mccloud sshkeygen'
+  ## Note 2: Amazon only supports RSA keys
+  ## Note 3: You can have multiple keypair listed here
+  #############################################################
+
+  config.keypair.define "mccloud" do |key_config|
+    key_config.keypair.public_key_path = "#{File.join(ENV['HOME'],'.ssh','mccloud_rsa.pub')}"
+    key_config.keypair.private_key_path = "#{File.join(ENV['HOME'],'.ssh','mccloud_rsa')}"
+  end
+
+  #############################################################
+  ## ** Key Store ** - defines a location to store keys in
+  #############################################################
+  ##
+  ## Defines a keystore provided by provider "aws-us-east"
+  ## And specifies the keypair(s) to be stored in that keystore
+  ## Note 1: this only handles creation, removal of keys needs to be done manual
+  ##
+  ## :name => "the name as visible on EC2"
+  ## :pairname=> "the name specified in the Key Section of this config file"
+  #############################################################
+
+  <% uncomment([:aws]) do %>
+  config.keystore.define "aws-us-east-key-store" do |keystore_config|
+    keystore_config.keystore.provider = "aws-us-east"
+    keystore_config.keystore.keypairs = [
+      # :name is the name as it will be displayed on amazon
+      # :keypair is the named as defined above
+      { :name => "mccloud-key", :keypair => "mccloud"},
+    ]
+  end
+  <% end %>
+
+  #############################################################
+  ## ** Server section ** Specifies server options
+  ##
+  ## Note: Loosely modelled after Vagrantfile syntax, but not compatible
+  #############################################################
+
+  config.vm.define "<%= @vm_name %>" do |vm_config|
+
+    # Provider to use for creating this vm
+    vm_config.vm.provider = "aws-us-east"
+
+    # AMI to use for creating the vm
+    vm_config.vm.ami = "ami-cef405a7"
+
+    # Flavor of the vm
+    vm_config.vm.flavor = "t1.micro"
+
+    # Availability zone to create the VM
+    vm_config.vm.zone = "us-east-1a"
+
+    # Security groups
+    # Note: if it starts with mccloud, it will be autocreated and port 22 will be opened
+    # Note: you can supply your own but you have to create these manual and open port 22
+    vm_config.vm.security_groups = [ "mccloud"]
+
+    # Options required 
+    # There are directly passed to fog create
+    vm_config.vm.create_options = { }
+
+    # User to log into the new VM created
+    vm_config.vm.user = "ubuntu"
+
+    # Path to script to execute before provisioners are run
+    # Only run on vm creation
+    vm_config.vm.bootstrap = "samples/bootstrap-ubuntu-system.sh"
+
+    # Name of the key pair to use to login
+    vm_config.vm.key_name = "mccloud-key"
+
+    # Files to ssh into the create vm
+    vm_config.vm.private_key_path = "#{File.join(ENV['HOME'],'.ssh','mccloud_rsa')}"
+
+    # If no server is specified in mccloud subcommands,
+    # It will go over all server
+    # Setting auto_selection to false, will not include this server
+    vm_config.vm.auto_selection = false
+
+    #    ###
+    #    ### Server Provisioners
+    #    ### Mccloud supports 3 provisioners : :chef_solo, :puppet , and :shell
+    #    ### Note: if multiple are provided, they are run in the sequence as described in the vm_config file
+    #    ###
+    #
+    #    ##
+    #    ## Sample chef solo provider
+    #    ##
+    #    vm_config.vm.provision :chef_solo do |chef|
+    #      # Path to load cookbooks of
+    #      chef.cookbooks_path = ["chefrepo/cookbooks","chefrepo/site-cookbooks"]
+    #
+    #      # Level to pass on the chef server
+    #      chef.log_level = "info"
+    #
+    #      ## Add recipes to the runlist
+    #      ## Can be specified multiple times
+    #      chef.add_recipe "apache2"
+    #
+    #      ## Note you can use ERB inside the json block
+    #      ## :private_demo1_ip => "<%%= private_ips['awsdemo1'] %>"
+    #      ## :public_demo2_ip=> "<%%= public_ips['awsdemo1'] %>"
+    #      chef.json.merge!( {
+    #      })
+    #    end
+    #
+    #    ##
+    #    ## Sample puppet provider
+    #    ##
+    vm_config.vm.provision :puppet do |puppet|
+      puppet.manifest_file = "aws-demo1.pp"
+      # puppet.manifest_path = "manifests"
+      # puppet.modules_path = ["modules"]
+    end
+    #
+    #    ##
+    #    ## Sample script provider
+    #    ##
+    #    vm_config.vm.provision :shell do |command|
+    #      # Either provide the command to run inline
+    #      command.inline  = ""
+    #      # Or provide the path to a local script to be executed remotely
+    #      command.path = "myscript.sh"
+    #    end
+
   end
-end
+
+
+  ##
+  #  ## Example on how to use the host provider for a server
+  #  ##
+  #  vm_config.vm.define "myserver" do |vm_config|
+  #    vm_config.vm.provider=:hosts
+  #    # Ip address or hostname that resolves
+  #    vm_config.vm.ip_address="www.myserver.com"
+  #    # Login in with user ubuntu on the remote server
+  #    vm_config.vm.user="ubuntu"
+  #    # Forward some ports between remote and local
+  #    # example remote port = 80, local port 8080
+  #    # Used by 'mccloud server' command
+  #    vm_config.vm.forward_port("webport",8080,80)
+  #
+  #    # Example provisioner via shell commands
+  #    vm_config.vm.provision :shell do |command|
+  #      command.inline="who am i"
+  #    end
+  #  end
+
+  #############################################################
+  ## ** Non-server section
+  ## Currently only had loadbalancer and ip-address for EC2
+  #############################################################
+
+  #    config.lb.define "mccloud-development-lb" do |config|
+  #      config.lb.provider="aws-eu-east"
+  #      config.lb.members=["aws-demo1","aws-demo1"]
+  #      config.lb.sorry_members=["aws-demo2"]
+  #    end
+  #
+  #    config.ip.define "mccloud-demo1" do |config|
+  #      config.ip.provider="aws-eu-west"
+  #      config.ip.address="46.137.72.170"
+  #      config.ip.vmname = "aws-demo1"
+  #    end
+
+
+
+end # End Mccloud

data/lib/mccloud/templates/bootstrap/bootstrap-chef-omnibus.sh

@@ -0,0 +1,8 @@
+#!/bin/bash -ex
+
+# download omnibus install.sh
+if which curl 2>/dev/null; then
+    curl -L https://www.opscode.com/chef/install.sh | sudo bash
+else
+    wget -q -O - https://www.opscode.com/chef/install.sh | sudo bash
+fi

data/lib/mccloud/templates/locales/en.yml

@@ -0,0 +1,30 @@
+en:
+  mccloud:
+    general:
+      creating_home_dir: "Creating home directory since it doesn't exist: %{directory}"
+      moving_home_dir: "Moving old Vagrant home directory to new location: %{directory}"
+      home_dir_migration_failed: |-
+        Both an old and new Vagrant home directory exist. Only the new one will
+        be used. Please merge the old directory into the new directory if you'd
+        like to use the old data as well.
+
+        Old: %{old}
+        New: %{new}
+
+#-------------------------------------------------------------------------------
+# Translations for exception classes
+#-------------------------------------------------------------------------------
+    errors:
+      base_vm_not_found: The base VM with the name '%{name}' was not found.
+      box_not_found: Box '%{name}' could not be found.
+      chef_not_detected: |-
+        The chef (either `chef-solo` or `chef-client`) binary was not found on
+        the VM and is required for chef provisioning. Please verify that chef
+        is installed and that the binary is available on the PATH.
+        
+
+#-------------------------------------------------------------------------------
+# Translations for config validation errors
+#-------------------------------------------------------------------------------
+    config:
+

data/lib/mccloud/templates/vm.erb

@@ -0,0 +1,9 @@
+Mccloud::Config.run do |config|
+  config.vm.define "<%= @name %>" do |vm_config|
+
+    # You can customize vm setting here if you want
+    # to override the settings of a definition
+    vm_config.vm.definition = "<%= @definition.name %>"
+
+  end
+end

data/lib/mccloud/templates.rb

@@ -0,0 +1,35 @@
+require 'mccloud/template'
+
+module Mccloud
+   class Templates < Hash
+    attr_reader :env
+
+    def initialize(env)
+      @env=env
+    end
+
+    def load!
+      if self.exists?
+        Dir[File.join(self.path,"**")].each do |dir|
+          template_name=File.basename(dir)
+          t=Template.new(template_name,env)
+          self[template_name]=t
+        end
+      else
+        env.logger.info "Skipping loading of definitions as the definition_path does exist"
+      end
+    end
+
+    def path
+      @env.config.mccloud.template_path
+    end
+
+    def exists?
+      File.directory?(self.path)
+    end
+
+    def registered?(name)
+      return self.has_key?(name)
+    end
+   end
+end

data/lib/mccloud/ui.rb

@@ -0,0 +1,82 @@
+module Mccloud
+  # Vagrant UIs handle communication with the outside world (typically
+  # through a shell). They must respond to the typically logger methods
+  # of `warn`, `error`, `info`, and `confirm`.
+  class UI
+    attr_accessor :env
+
+    def initialize(env)
+      @env = env
+    end
+
+    [:warn, :error, :info, :confirm].each do |method|
+      define_method(method) do |message|
+        # Log normal console messages
+        env.logger.info("ui") { message }
+      end
+    end
+
+    [:clear_line, :report_progress, :ask, :no?, :yes?].each do |method|
+      # By default do nothing, these aren't logged
+      define_method(method) { |*args| }
+    end
+
+    # A shell UI, which uses a `Thor::Shell` object to talk with
+    # a terminal.
+    class Shell < UI
+      def initialize(env, shell)
+        super(env)
+
+        @shell = shell
+      end
+
+      [[:warn, :yellow], [:error, :red], [:info, nil], [:confirm, :green]].each do |method, color|
+        class_eval <<-CODE
+          def #{method}(message, opts=nil)
+            super(message)
+            opts ||= {}
+            opts[:new_line] = true if !opts.has_key?(:new_line)
+            @shell.say("\#{format_message(message, opts)}", #{color.inspect}, opts[:new_line])
+          end
+        CODE
+      end
+
+      [:ask, :no?, :yes?].each do |method|
+        class_eval <<-CODE
+          def #{method}(message, opts=nil)
+            super(message)
+            opts ||= {}
+            @shell.send(#{method.inspect}, format_message(message, opts), opts[:color])
+          end
+        CODE
+      end
+
+      def report_progress(progress, total, show_parts=true)
+        percent = (progress.to_f / total.to_f) * 100
+        line = "Progress: #{percent.to_i}%"
+        line << " (#{progress} / #{total})" if show_parts
+
+        @shell.say(line, nil, false)
+      end
+
+      def clear_line
+        @shell.say(line_reset, nil, false)
+      end
+
+      protected
+
+      def format_message(message, opts=nil)
+        opts = { :prefix => true }.merge(opts || {})
+        opts[:prefix]=false if env.resource=="mccloud"
+        message = "[#{env.resource}] #{message}" if opts[:prefix]
+        message
+      end
+
+      def line_reset
+        reset = "\r"
+        reset += "\e[0K" unless Util::Platform.windows?
+        reset
+      end
+    end
+  end
+end

data/lib/mccloud/util/rostruct.rb

@@ -0,0 +1,24 @@
+#http://blade.nagaokaut.ac.jp/cgi-bin/scat.rb/ruby/ruby-talk/150311
+
+require 'ostruct'
+
+class ROpenStruct < OpenStruct
+        def method_missing(mid, *args)
+                mname = mid.id2name
+    len = args.length
+    if len == 0
+      @table[mname.intern] = ROpenStruct.new
+      self.new_ostruct_member(mname)
+      @table[mname.intern]
+    else
+        super
+    end
+        end
+end
+
+test = ROpenStruct.new
+test.p = "hello"
+test.t.s.p.t.z.y.x = "hi"
+test.xyz
+
+p test

data/lib/mccloud/util/rsync.rb

@@ -1,9 +1,13 @@
 require "pty"
 module Mccloud
-	module Util
-		def self.rsync(path,vm,instance)
-			command="rsync --delete -avz -e 'ssh -p 22 -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o IdentitiesOnly=yes -i \"#{vm.private_key}\"' '#{path}/' '#{vm.user}@#{instance.public_ip_address}:/tmp/#{File.basename(path)}/'"
-			puts command
+  module Util
+    def self.rsync(path,vm,instance)
+      unless !File.exists?(path)
+        env.logger.info "[#{vm.name}] - rsyncing #{path}"
+        command="rsync  --exclude='.DS_Store' --exclude='.git' --exclude='.hg' --delete --delete-excluded  -az -e 'ssh -p 22 -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i \"#{vm.private_key}\"' '#{path}/' '#{vm.user}@#{instance.public_ip_address}:/tmp/#{File.basename(path)}/'"
+      else
+        raise Mccloud::Error, "[#{vm.name}] - rsync error: #{path} does no exist"
+      end
     begin
       PTY.spawn( command ) do |r, w, pid|
         begin
@@ -13,9 +17,9 @@ module Mccloud
      end
    rescue PTY::ChildExited => e
       puts "The child process exited!"
-			   end
-			#Kernel.exec(command)
-		end
-	end
+         end
+      #Kernel.exec(command)
+    end
+  end
 end
 

data/lib/mccloud/util/ssh.rb

@@ -1,14 +1,15 @@
 module Mccloud
   module Util
 
+    class Ssh
     def self.when_ssh_login_works(ip="localhost", options = {  } , &block)
 
-      defaults={ :port => '22', :timeout => 200 , :user => 'vagrant', :password => 'vagrant'}
+      defaults={ :port => '22', :timeout => 20000 , :user => 'vagrant', :password => 'vagrant'}
 
       options=defaults.merge(options)
 
       puts
-      puts "Waiting for ssh login with user #{options[:user]} to sshd on port => #{options[:port]} to work"
+      puts "Waiting for ssh login on #{ip} with user #{options[:user]} to sshd on port => #{options[:port]} to work (Timeout in #{options[:timeout]} seconds)"
 
       begin
         Timeout::timeout(options[:timeout]) do
@@ -16,12 +17,12 @@ module Mccloud
           while !connected do
             begin
               print "."
-              Net::SSH.start(ip, options[:user], { :port => options[:port] , :password => options[:password], :paranoid => false, :timeout => options[:timeout]  }) do |ssh|
+              Net::SSH.start(ip, options[:user], { :port => options[:port] , :password => options[:password], :paranoid => false, :timeout => options[:timeout] ,:keys => options[:keys] }) do |ssh|
                 block.call(ip);
                 puts ""
                 return true
               end
-            rescue Net::SSH::Disconnect,Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Errno::ECONNABORTED, Errno::ECONNRESET, Errno::ENETUNREACH
+            rescue Net::SSH::AuthenticationFailed,Net::SSH::Disconnect,Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Errno::ECONNABORTED, Errno::ECONNRESET, Errno::ENETUNREACH
               sleep 5
             end
           end
@@ -36,6 +37,10 @@ module Mccloud
 
     def self.transfer_file(host,filename,destination = '.' , options = {})
 
+      unless File.exists?(filename)
+        raise Mccloud::Error,"Can't transfer #{filename}: does not exist"
+      end
+
       Net::SSH.start( host,options[:user],options ) do |ssh|
         puts "Transferring #{filename} to #{destination} "
         ssh.scp.upload!( filename, destination ) do |ch, name, sent, total|
@@ -43,7 +48,7 @@ module Mccloud
           print "."
 
         end
-      end 
+      end
       puts
     end
 
@@ -52,7 +57,7 @@ module Mccloud
     #after the machine boots
     def self.execute_when_tcp_available(ip="localhost", options = { } , &block)
 
-      defaults={ :port => 22, :timeout => 2 , :pollrate => 5}
+      defaults={ :port => 22, :timeout => 20000 , :pollrate => 5}
 
       options=defaults.merge(options)
 
@@ -66,7 +71,7 @@ module Mccloud
               s.close
               block.call(ip);
               return true
-            rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH
+            rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH,Errno::ETIMEDOUT
               sleep options[:pollrate]
             end
           end
@@ -79,7 +84,7 @@ module Mccloud
     end
 
     def self.ssh(host ,user , options = { :progress => "on" } ,command=nil ,exitcode=0)
-      
+
       defaults= { :port => "22",  :user => "root", :paranoid => false }
       options=defaults.merge(options)
       @pid=""
@@ -97,8 +102,8 @@ module Mccloud
         channel = ssh.open_channel do |ch|
 
           #request pty for sudo stuff and so
-          ch.request_pty do |ch, success| 
-            raise "Error requesting pty" unless success 
+          ch.request_pty do |ch, success|
+            raise "Error requesting pty" unless success
           end
 
 
@@ -153,7 +158,7 @@ module Mccloud
         if (exitcode=="*")
           #its a test so we don't need to worry
         else
-	  puts "Exitcode = #{exitcode} - #{@status.to_s}"	
+          puts "Exitcode = #{exitcode} - #{@status.to_s}"
           raise "Exitcode was not what we expected"
         end
 
@@ -161,7 +166,8 @@ module Mccloud
 
     end
 
+  end #Class
 
+   end #Module
 
-  end #Class
 end #Module