mccloud 0.0.2 → 0.0.3

data/lib/mccloud/util/iterator.rb

@@ -3,18 +3,17 @@ module Mccloud
   module Util
     def on_selected_machines(selection=nil)
       if selection.nil? || selection == "all"
-        puts "no selection - all machines"
+        #puts "no selection - all machines"
         @session.config.vms.each do |name,vm|
           id=@all_servers["#{name}"]
           vm=@session.config.vms[name]
-          yield id,vm
-
+            yield id,vm
         end
       else
         name=selection
         id=@all_servers["#{name}"]
         vm=@session.config.vms[name]
-        yield id,vm
+          yield id,vm
       end
     end
   end

data/lib/mccloud/util/sshkey.rb

@@ -0,0 +1,74 @@
+#Shameless copy of https://github.com/bensie/sshkey/raw/master/lib/sshkey.rb
+# Make it 1.8 compatbible
+
+require 'openssl'
+require 'base64'
+require 'digest/md5'
+
+module Mccloud
+  module Util
+    
+class SSHKey
+
+  def self.generate(options = {})
+    SSHKey.new(OpenSSL::PKey::RSA.generate(2048).to_pem, options)
+  end
+
+  attr_reader :key_object, :comment, :rsa_private_key, :rsa_public_key, :ssh_public_key, :fingerprint
+
+  def initialize(private_key, options = {})
+    @key_object        = OpenSSL::PKey::RSA.new(private_key)
+    @comment           = options[:comment] || ""
+    @rsa_private_key   = @key_object.to_pem
+    @rsa_public_key    = @key_object.public_key.to_pem
+    raw_ssh_public_key = ssh_public_key_conversion
+    
+#    @ssh_public_key    = ["ssh-rsa", Base64.strict_encode64(raw_ssh_public_key), @comment].join(" ").strip
+
+    @ssh_public_key    = ["ssh-rsa", [raw_ssh_public_key].pack("m0").gsub(/\n/,''), @comment].join(" ").strip
+    @fingerprint       = Digest::MD5.hexdigest(raw_ssh_public_key).gsub(/(.{2})(?=.)/, '\1:\2')
+  end
+
+  private
+
+  # All data type encoding is defined in the section #5 of RFC #4251.
+  # String and mpint (multiple precision integer) types are encoded this way :
+  # 4-bytes word: data length (unsigned big-endian 32 bits integer)
+  # n bytes     : binary representation of the data
+
+  # For instance, the "stringsh-rsa" string is encoded as the following byte array
+  # [0, 0, 0, 7, 's', 's', 'h', '-', 'r', 's', 'a']
+  def ssh_public_key_conversion
+    e = @key_object.public_key.e.to_i
+    n = @key_object.public_key.n.to_i
+
+    out = [0,0,0,7].pack("c*")
+    out += "ssh-rsa"
+    out += encode_unsigned_int_32(to_byte_array(e).length).pack("c*")
+    out += to_byte_array(e).pack("c*")
+    out += encode_unsigned_int_32(to_byte_array(n).length).pack("c*")
+    out += to_byte_array(n).pack("c*")
+
+    return out
+  end
+
+  def encode_unsigned_int_32(value)
+    out = []
+    out[0] = value >> 24 & 0xff
+    out[1] = value >> 16 & 0xff
+    out[2] = value >> 8 & 0xff
+    out[3] = value & 0xff
+    return out
+  end
+
+  def to_byte_array(num)
+    result = []
+    begin
+      result << (num & 0xff)
+      num >>= 8
+    end until (num == 0 || num == -1) && (result.last[7] == num[7])
+    result.reverse
+  end
+end
+end
+end

data/lib/mccloud/version.rb

@@ -1,3 +1,3 @@
 module Mccloud
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/mccloud.gemspec

@@ -15,6 +15,7 @@ Gem::Specification.new do |s|
   s.rubyforge_project         = "mccloud"
 
   s.add_dependency "net-ssh", "~> 2.1.0"
+  #s.add_dependency "sshkey"
   s.add_dependency "net-scp"
   s.add_dependency "fog"
   s.add_dependency "json"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mccloud
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Patrick Debois
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-06 00:00:00 +02:00
+date: 2011-04-08 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -245,7 +245,14 @@ files:
 - lib/mccloud/provisioner/vagrant/puppet_server.rb
 - lib/mccloud/provisioner/vagrant/shell.rb
 - lib/mccloud/session.rb
-- lib/mccloud/templates/Mccloudfilet
+- lib/mccloud/templates/Mccloudfile.erb
+- lib/mccloud/templates/bootstrap-centos-rubysource-1.8.7.sh
+- lib/mccloud/templates/bootstrap-centos-rvm-1.8.7.sh
+- lib/mccloud/templates/bootstrap-centos-rvm-1.9.2.sh
+- lib/mccloud/templates/bootstrap-centos-rvm-ree-1.8.7.sh
+- lib/mccloud/templates/bootstrap-custom.sh
+- lib/mccloud/templates/bootstrap-ubuntu-rvm-1.8.7.sh
+- lib/mccloud/templates/bootstrap-ubuntu-system.sh
 - lib/mccloud/type/forwarding.rb
 - lib/mccloud/type/lb.rb
 - lib/mccloud/type/vm.rb
@@ -253,10 +260,9 @@ files:
 - lib/mccloud/util/platform.rb
 - lib/mccloud/util/rsync.rb
 - lib/mccloud/util/ssh.rb
+- lib/mccloud/util/sshkey.rb
 - lib/mccloud/version.rb
 - mccloud.gemspec
-- ruby-bootstrap.sh
-- ruby-bootstrap2.sh
 has_rdoc: true
 homepage: http://github.com/jedi4ever/mccloud/
 licenses: []

data/lib/mccloud/templates/Mccloudfilet

@@ -1,44 +0,0 @@
-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="mccloud"
-
-  config.vm.define :web do |web_config|
-    web_config.vm.ami = "ami-cef405a7"
-    web_config.vm.provider="AWS"
-
-    #web_config.vm.provisioner=:chef_solo
-    #web_config.vm.provisioner=:puppet
-
-    web_config.vm.provider_options={ 
-      # ID = "ami-cef405a7" = x64 Ubuntu 10.10
-      :image_id => 'ami-cef405a7', 
-      # Flavors
-      :flavor_id => 't1.micro',
-      #:flavor_id => 'm1.large',
-      :groups => %w(ec2securitygroup), :key_name => "ec2-keyname",
-      :availability_zone => "us-east-1b" 
-    }
-    web_config.vm.forward_port("http", 80, 8080)
-    web_config.vm.user="ubuntu"
-    web_config.vm.bootstrap="ruby-bootstrap.sh"
-    web_config.vm.private_key="my-ec2-key.pem"
-  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"
-  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!({})
-  end
-end

data/ruby-bootstrap2.sh

@@ -1,39 +0,0 @@
-#!/bin/bash -ex
-
-# redirecting output 
-# http://alestic.com/2010/12/ec2-user-data-output
-#exec > >(tee /var/log/user-data.log|logger -t user-data -s 2>/dev/console) 2>&1
-
-apt-get -y update
-apt-get -y upgrade
-apt-get -y dist-upgrade
-
-apt-get -y install git
-
-# For CC compiler of ruby
-apt-get -y install build-essential
-
-# no such file to load -- zlib (LoadError)
-# http://stackoverflow.com/questions/2441248/rvm-ruby-1-9-1-troubles
-apt-get install -y zlib1g-dev libssl-dev libreadline5-dev libxml2-dev libsqlite3-dev
-
-> /tmp/base-finished
-
-#/.rvm/src/rvm/scripts/install: line 243: HOME: unbound variable
-HOME="/root"
-export HOME
-
-# RVM
-# http://rvm.beginrescueend.com/
-#bash < <( curl http://rvm.beginrescueend.com/releases/rvm-install-head )
-bash < <( curl -L http://bit.ly/rvm-install-system-wide )
-
-echo ". /usr/local/rvm" >> /etc/profile.d/rvm-system-wide
-
-#
-#[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm"
-. /usr/local/rvm/scripts/rvm
-
-rvm install 1.9.2
-rvm use 1.9.2 --default
-