mccloud 0.0.1 → 0.0.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mccloud (0.0.1)
+    mccloud (0.0.2)
       cucumber (= 0.8.5)
       fog
       highline (~> 1.6.1)

data/bin/mccloud

@@ -18,9 +18,10 @@ class MccloudCLI < Thor
 
   end
 
-  desc "init [AMI-ID]", "initializes a box from a template" 
+  desc "init", "creates a Mccloud Config File" 
   method_options :force => :boolean
   def init(amiId=nil)
+    Mccloud::Command.init(amiId,options)
   end
 
   desc "up", "bring a machine up"

data/lib/mccloud/command/bootstrap.rb

@@ -6,7 +6,7 @@ module Mccloud
       on_selected_machines(selection) do |id,vm|
         puts "bootstrap #{selection} "
         server=vm.instance
-        server.private_key_path=vm.key
+        server.private_key_path=vm.private_key
         server.username = vm.user
         if server.state == "running"
           puts "Uploading bootstrap code to machine #{vm.name}"

data/lib/mccloud/command/command.rb

@@ -4,7 +4,7 @@ module Mccloud
       unless options.parallel?
       on_selected_machines(selection) do |id,vm|
         server=PROVIDER.servers.get(id)
-        server.private_key_path=vm.key
+        server.private_key_path=vm.private_key
         server.username = vm.user
           if server.state == "running"
             result=server.ssh(command)

data/lib/mccloud/command/init.rb

@@ -1,6 +1,8 @@
+require 'mccloud/generators'
+
 module Mccloud
   module Command
-  def init(amiId=nil)
+  def self.init(amiId=nil,options=nil)
     Mccloud::Generators.run_cli Dir.pwd, File.basename(__FILE__), Mccloud::VERSION, ARGV
   end
 end

data/lib/mccloud/command/multi.rb

@@ -14,7 +14,7 @@ module Mccloud
            instance=vm.instance
            if instance.state == "running"
              ip2name[instance.public_ip_address]=vm.name
-             session.use "#{instance.public_ip_address}", { :user => vm.user , :keys => [ vm.key ], :paranoid => false, :keys_only => true}
+             session.use "#{instance.public_ip_address}", { :user => vm.user , :keys => [ vm.private_key ], :paranoid => false, :keys_only => true}
            end
          end
 

data/lib/mccloud/command/provision.rb

@@ -6,7 +6,7 @@ module Mccloud
     def provision(selection=nil,options=nil)
       on_selected_machines(selection) do |id,vm|
         instance=vm.instance
-        instance.private_key_path=vm.key
+        instance.private_key_path=vm.private_key
         instance.username = vm.user
   
         #p vm.provisioner

data/lib/mccloud/command/server.rb

@@ -11,7 +11,7 @@ module Mccloud
           public_ip_address=vm.instance.public_ip_address
           private_ip_address=vm.instance.private_ip_address
           unless public_ip_address.nil? || private_ip_address.nil?
-            ssh_options={ :keys => [ vm.key ], :paranoid => false, :keys_only => true}
+            ssh_options={ :keys => [ vm.private_key ], :paranoid => false, :keys_only => true}
             Net::SSH.start(public_ip_address, vm.user, ssh_options) do |ssh|
               vm.forwardings.each do |forwarding|
                 puts "forwarding port #{forwarding.remote} from #{vm.name} to local port #{forwarding.local}"

data/lib/mccloud/command/ssh.rb

@@ -23,7 +23,7 @@ module Mccloud
     end
 
     #https://github.com/mitchellh/vagrant/blob/master/lib/vagrant/ssh.rb
-    options={ :port => 22, :private_key_path => vm.key, 
+    options={ :port => 22, :private_key_path => vm.private_key, 
       :username => vm.user , :host => vm.instance.public_ip_address }
       # Command line options
       command_options = ["-p #{options[:port]}", "-o UserKnownHostsFile=/dev/null",

data/lib/mccloud/command/up.rb

@@ -14,7 +14,15 @@ module Mccloud
           provider_options=vm.provider_options
           boxname=vm.name
           puts "Spinning up a new machine called #{boxname}"
-          instance=provider.servers.create(provider_options)
+          
+          provider_options=provider_options.merge({ :private_key_path => vm.private_key , :public_key_path => vm.public_key, :username => vm.user})
+          
+          #pp provider_options 
+          instance=provider.servers.bootstrap(provider_options)
+
+          #instance=provider.servers.create(provider_options)
+          #instance=provider.servers.create(provider_options)
+          
           puts "Waiting for it the machine to become accessible"
           instance.wait_for { printf "."; STDOUT.flush;  ready?}
           puts
@@ -54,7 +62,6 @@ module Mccloud
 
       @session.provision(selection,options)       
 
-      #server.boostrap(:image_id => 'ami', :private_key_path => '', :public_key_path => '')
     end
  
  

data/lib/mccloud/generators.rb

@@ -11,10 +11,10 @@ module Mccloud
 
       desc <<-DESC
       Initialize a mccloud environment 
-      mccloud init [AMI-ID]
+      mccloud init
       DESC
 
-      first_argument :ami_id, :required => true, :desc => 'AMI ID'
+#      first_argument :ami_id, :required => true, :desc => 'AMI ID'
  
       template :mccloudfile, 'Mccloudfile'
                 

data/lib/mccloud/provisioner/chef_solo.rb

@@ -43,7 +43,7 @@ module Mccloud
         end
         
         puts "Running chef-solo"
-        options={ :port => 22, :keys => [ vm.key ], :paranoid => false, :keys_only => true}
+        options={ :port => 22, :keys => [ vm.private_key ], :paranoid => false, :keys_only => true}
         Mccloud::Util.ssh(vm.instance.public_ip_address,vm.user,options,"sudo chef-solo -c /tmp/solo.rb -j /tmp/dna.json -l debug")
         
       end

data/lib/mccloud/provisioner/puppet.rb

@@ -30,7 +30,7 @@ module Mccloud
         vm.instance.scp(@manifest_file,"#{@pp_path}/manifest.pp")      
         
         puts "Running puppet"
-        options={ :port => 22, :keys => [ vm.key ], :paranoid => false, :keys_only => true}
+        options={ :port => 22, :keys => [ vm.private_key ], :paranoid => false, :keys_only => true}
         Mccloud::Util.ssh(vm.instance.public_ip_address,vm.user,options,"sudo puppet #{@pp_path}/manifest.pp")
         
       end

data/lib/mccloud/templates/Mccloudfilet

@@ -24,7 +24,7 @@ Mccloud::Config.run do |config|
     web_config.vm.forward_port("http", 80, 8080)
     web_config.vm.user="ubuntu"
     web_config.vm.bootstrap="ruby-bootstrap.sh"
-    web_config.vm.key="my-ec2-key.pem"
+    web_config.vm.private_key="my-ec2-key.pem"
   end
 
   ### Provisioners

data/lib/mccloud/type/vm.rb

@@ -8,7 +8,8 @@ module Mccloud
     attr_accessor :provider_options
     attr_accessor :name
     attr_accessor :user
-    attr_accessor :key
+    attr_accessor :private_key
+    attr_accessor :public_key
     attr_accessor :bootstrap
     attr_accessor :provisioner
     attr_accessor :forwardings

data/lib/mccloud/util/rsync.rb

@@ -2,7 +2,7 @@ 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.key}\"' '#{path}/' '#{vm.user}@#{instance.public_ip_address}:/tmp/#{File.basename(path)}/'"
+			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
     begin
       PTY.spawn( command ) do |r, w, pid|

data/lib/mccloud/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mccloud
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Patrick Debois