chapp 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df5a3ee559314be541400ce3f160eb2249a3eb33
-  data.tar.gz: c30c0a7a36926f19790ae97662f8f1994b436c7c
+  metadata.gz: c248d2e06794fd78569bb13df69a0405d2e156fc
+  data.tar.gz: 6273136e426fd9a05b941b6693057e4ecbb3e733
 SHA512:
-  metadata.gz: 7ffa4a00648cd946eae3a84c5261e29fb794af24dee1f6cd98bf883c17ac8972f61d5c4afb728beab8979982c93d6307b503e9d311c82b9a15ab30500e9be6d7
-  data.tar.gz: 85952443b0773e367700db08ef5eb1c6e8f4c113b22f7ea3b8fb122384e23b0d71472002f73c94c3f05a788b5edf7aebd15661c6457c04c90a790f009aad1651
+  metadata.gz: 7d3bac46993def58aab672bc35107e95b87580152b451439d344eee713aaed02ec4b441664181d6d0c4b5195f076f028c5fad331d1412dbbfbfed9bc380c6d29
+  data.tar.gz: d9f4baeda30730a9555f194d15f1a73401d92eab4b234fa5da43af8c86fdbf7ec1e3f8a580760dfe1c12f0eb218d25c4c54ecf43cbfa330f3eb8ac9d65a9cab3

data/lib/chapp.rb

@@ -4,17 +4,17 @@ require 'chapp/app_config'
 require 'chapp/wiring'
 require 'chapp/database'
 require 'chapp/provisioner'
-require 'chapp/provisioner/ec2_provisioner'
+require 'chapp/provisioner/property_provisioner'
 
 module Chapp
-  
+
   def self.database
     Chapp::Database.new
   end
-  
+
   def self.provisioner
     # TODO: Make configurable
-    Chapp::EC2Provisioner.new
+    Chapp::PropertyProvisioner.new
   end
-  
-end
+
+end

data/lib/chef/knife/app_upload.rb

@@ -4,32 +4,32 @@ require 'chapp'
 class Chef
   class Knife
     class AppUpload < Chef::Knife
-      
+
       banner "knife app upload app_file (options)"
       category "app"
-      
+
       # This method will be executed when you run this knife command.
       def run
-        
+
         # Get Arguments
         if @name_args.size != 1
           ui.info("Please specify an app_file")
           show_usage
           exit 1
         end
-        
+
         app_config_file = @name_args[0]
-        
+
         # Build app config from file
         app_config = Chapp::AppConfig.from_file app_config_file
-        
+
         # Write the app config
         Chapp.database.write_app_config app_config
-        
-        puts "Uploaded app [#{app_config.id}]"
+
+        puts "Uploaded app [#{app_config.id_hash}]"
       end
-      
-      
+
+
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chapp
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Bryan Baugher
@@ -24,20 +24,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '11.0'
-- !ruby/object:Gem::Dependency
-  name: aws-sdk
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.47'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.47'
 - !ruby/object:Gem::Dependency
   name: chef-metal
   requirement: !ruby/object:Gem::Requirement
@@ -92,7 +78,6 @@ files:
 - lib/chapp/app_config.rb
 - lib/chapp/app_instance.rb
 - lib/chapp/database.rb
-- lib/chapp/provisioner/ec2_provisioner.rb
 - lib/chapp/provisioner/property_provisioner.rb
 - lib/chapp/provisioner.rb
 - lib/chapp/wiring.rb

data/lib/chapp/provisioner/ec2_provisioner.rb

@@ -1,73 +0,0 @@
-require 'chapp'
-require 'aws-sdk'
-require 'chef_metal/transport/ssh'
-
-module Chapp
-  class EC2Provisioner < Chapp::Provisioner
-
-    # Knife config
-    ACCESS_KEY = "ec2_access_key_id"
-    SECRET_KEY = "ec2_secret_access_key"
-    KEY_PAIR = "ec2_key_pair"
-
-    # App config
-    IMAGE_ID = "image_id"
-    INSTANCE_TYPE = "instance_type"
-
-    def build_server app_config, properties
-
-      errors = []
-
-      access_key = Chef::Config[ACCESS_KEY]
-      secret_key = Chef::Config[SECRET_KEY]
-      key_pair = Chef::Config[KEY_PAIR]
-
-      if access_key.nil?
-        errors << "#{ACCESS_KEY} must be specified in your knife config"
-      end
-
-      if secret_key.nil?
-        errors << "#{SECRET_KEY} must be specified in your knife config"
-      end
-
-      if key_pair.nil?
-        errors << "#{KEY_PAIR} must be specified in your knife config"
-      end
-
-      unless app_config.cloud.has_key? IMAGE_ID
-        errors << "#{IMAGE_ID} must be specified in your app's cloud config"
-      end
-
-      unless app_config.cloud.has_key? INSTANCE_TYPE
-        errors << "#{INSTANCE_TYPE} must be specified in your app's cloud config"
-      end
-
-      image_id = app_config.cloud[IMAGE_ID]
-      instance_type = app_config.cloud[INSTANCE_TYPE]
-
-      ec2 = AWS::EC2.new(:access_key_id => access_key, :secret_access_key => secret_key)
-
-      instance = ec2.instances.create(
-        :image_id => image_id,
-        :instance_type => instance_type,
-        :key_pair => ec2.key_pairs[key_pair]
-      )
-
-      puts "Waiting for new instance with id #{instance.id} to become available..."
-      sleep 1 while instance.status == :pending
-
-      puts "#{instance.dns_name} is ready"
-      puts "Waiting for host to finish booting ..."
-
-      # TODO: Wait for SSH to become available
-      ssh = ChefMetal::Transport::SSH.new instance.dns_name, "root", {:keys => [Chef::Config[:knife][:identity_file]]}, {}, {}
-
-      while !ssh.available?
-        sleep 5
-      end
-
-      instance.dns_name
-    end
-
-  end
-end