waz-cmd 0.2.0 → 0.3.0

data/bin/waz

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 require 'waz-cmd'
+require 'waz-cmd/version'
 require 'commander/import'
 require 'waz-blobs'
 require 'uri'
@@ -9,7 +10,7 @@ require 'fileutils'
 include Waz::Cmd
 
 program :name, 'waz'
-program :version, '1.0'
+program :version, Waz::Cmd::VERSION
 program :description, 'Windows Azure Command-line Tool'
 program :help, 'Author', 'Steve Marx (http://blog.smarx.com, Steve.Marx@microsoft.com, @smarx)'
 
@@ -473,18 +474,24 @@ command 'deploy' do |c|
       blob = container.upload(URI::escape(name), f, 'application/octet-stream')
     end
 
-    make_call("services/hostedservices/#{args[0]}/deploymentslots/#{args[1]}", :post, options,
-      Nokogiri::XML::Builder.new(:encoding => 'utf-8') { |xml|
-        xml.CreateDeployment('xmlns' => 'http://schemas.microsoft.com/windowsazure') {
-          xml.Name UUIDTools::UUID.random_create.to_s.gsub '-', ''
-          xml.PackageUrl URI::unescape blob.url
-          xml.Label Base64.encode64 name
-          xml.Configuration Base64.encode64 File.read args[3]
-          xml.StartDeployment 'true'
-          xml.TreatWarningsAsError 'false'
-        }
-      }.to_xml) do |response|
-      wait_for_completion options, response.headers[:x_ms_request_id]
+    config = File.read(args[3])
+    config = config[3..-1] if config[0..2].force_encoding('utf-8') == "\xEF\xBB\xBF".force_encoding('utf-8')
+    begin
+      make_call("services/hostedservices/#{args[0]}/deploymentslots/#{args[1]}", :post, options,
+        Nokogiri::XML::Builder.new(:encoding => 'utf-8') { |xml|
+          xml.CreateDeployment('xmlns' => 'http://schemas.microsoft.com/windowsazure') {
+            xml.Name UUIDTools::UUID.random_create.to_s.gsub '-', ''
+            xml.PackageUrl URI::unescape blob.url
+            xml.Label Base64.encode64 name
+            xml.Configuration Base64.encode64 config
+            xml.StartDeployment 'true'
+            xml.TreatWarningsAsError 'false'
+          }
+        }.to_xml) do |response|
+        wait_for_completion options, response.headers[:x_ms_request_id]
+      end
+    rescue => e
+      p e
     end
 
     blob.destroy!

data/lib/waz-cmd/templates/list_affinity_groups.erb

@@ -1,3 +1,3 @@
 % groups.each do |group|
-<%= Tilt.new('show_affinity_group.erb', 1, :trim => '%').render(nil, :group => group) %>
+<%= Tilt.new(template('show_affinity_group.erb'), 1, :trim => '%').render(nil, :group => group) %>
 % end

data/lib/waz-cmd/version.rb

@@ -1,5 +1,5 @@
 module Waz
   module Cmd
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
   end
 end

metadata

@@ -1,117 +1,91 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: waz-cmd
-version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: false
-  segments: 
-  - 0
-  - 2
-  - 0
-  version: 0.2.0
+version: !ruby/object:Gem::Version
+  version: 0.3.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Steve Marx
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-01 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-07-09 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: commander
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &19385100 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: tilt
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *19385100
+- !ruby/object:Gem::Dependency
+  name: tilt
+  requirement: &19384716 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: crack
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *19384716
+- !ruby/object:Gem::Dependency
+  name: crack
+  requirement: &19384272 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: nokogiri
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *19384272
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: &19383924 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: waz-storage
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *19383924
+- !ruby/object:Gem::Dependency
+  name: waz-storage
+  requirement: &19383480 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: uuidtools
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *19383480
+- !ruby/object:Gem::Dependency
+  name: uuidtools
+  requirement: &19382988 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id006
-description: This gem allows you to perform most of the available operations in the Windows Azure Service Management API from a friendly commandline tool.
-email: 
+  prerelease: false
+  version_requirements: *19382988
+description: This gem allows you to perform most of the available operations in the
+  Windows Azure Service Management API from a friendly commandline tool.
+email:
 - Steve.Marx@microsoft.com
-executables: 
+executables:
 - waz
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - LICENSE
@@ -131,39 +105,28 @@ files:
 - lib/waz-cmd/templates/show_storage.erb
 - lib/waz-cmd/version.rb
 - waz-cmd.gemspec
-has_rdoc: true
 homepage: http://github.com/smarx/waz-cmd
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Command-line tool to manage Windows Azure applications and storage accounts.
 test_files: []
-