jdc 0.2.1.pre → 0.2.1

data/lib/{micro → jdc/micro}/vmrun.rb

@@ -1,15 +1,13 @@
-require "micro/errors"
-
-module JDCMicro
+module JDC::Micro
   class VMrun
     attr_reader :vmx, :vmrun
 
     def initialize(config)
-      @platform = config[:platform]
+      @platform = config['platform']
       @user = 'root' # must use root as we muck around with system settings
-      @password = config[:password]
-      @vmrun = config[:vmrun]
-      @vmx = config[:vmx]
+      @password = config['password']
+      @vmrun = config['vmrun']
+      @vmx = config['vmx']
 
       # TODO honor TMPDIR
       if @platform == :windows
@@ -19,10 +17,6 @@ module JDCMicro
       end
     end
 
-    def vmx
-      @vmx
-    end
-
     def connection_type
       read_variable('ethernet0.connectionType')
     end
@@ -41,7 +35,7 @@ module JDCMicro
 
     def domain
       # switch to Dir.mktmpdir
-      state_config = JDCMicro.escape_path(File.join(@temp_dir, 'state.yml'))
+      state_config = JDC::Micro.escape_path(File.join(@temp_dir, 'state.yml'))
       run('CopyFileFromGuestToHost', "/var/vcap/bosh/state.yml #{state_config}")
       bosh_config = YAML.load_file(state_config)
       bosh_config['properties']['domain']
@@ -49,8 +43,8 @@ module JDCMicro
 
     def ip
       # switch to Dir.mktmpdir
-      path = JDCMicro.escape_path(JDCMicro.config_file('refresh_ip.rb'))
-      ip_file = JDCMicro.escape_path(File.join(@temp_dir, 'ip.txt'))
+      path = JDC::Micro.escape_path(JDC::Micro.config_file('refresh_ip.rb'))
+      ip_file = JDC::Micro.escape_path(File.join(@temp_dir, 'ip.txt'))
       run('CopyFileFromHostToGuest', "#{path} /tmp/refresh_ip.rb")
       run('runProgramInGuest', '/tmp/refresh_ip.rb')
       run('CopyFileFromGuestToHost', "/tmp/ip.txt #{ip_file}")
@@ -60,7 +54,7 @@ module JDCMicro
     def list
       vms = run("list")
       vms.delete_if { |line| line =~ /^Total/ }
-      vms.map { |line| JDCMicro.escape_path(File.expand_path(line)) }
+      vms.map { |line| JDC::Micro.escape_path(File.expand_path(line)) }
     end
 
     def offline?
@@ -74,12 +68,12 @@ module JDCMicro
       elsif $?.exitstatus == 0
         return true
       else
-        raise JDCMicro::MCFError, "failed to execute vmrun:\n#{result}"
+        raise "failed to execute vmrun:\n#{result}"
       end
     end
 
     def offline!
-      path = JDCMicro.escape_path(JDCMicro.config_file('offline.conf'))
+      path = JDC::Micro.escape_path(JDC::Micro.config_file('offline.conf'))
       run('CopyFileFromHostToGuest', "#{path} /etc/dnsmasq.d/offline.conf")
       run('runProgramInGuest', '/usr/bin/touch /var/vcap/micro/offline')
       run('runProgramInGuest',
@@ -107,7 +101,7 @@ module JDCMicro
       elsif $?.exitstatus == 1
         return false
       else
-        raise JDCMicro::MCFError, "failed to execute vmrun:\n#{result}"
+        raise "failed to execute vmrun:\n#{result}"
       end
     end
 
@@ -134,15 +128,14 @@ module JDCMicro
       if command.include?('Guest')
         command = "-gu #{@user} -gp #{@password} #{command}"
       end
-      JDCMicro.run_command(@vmrun, "#{command} #{@vmx} #{args}")
+      JDC::Micro.run_command(@vmrun, "#{command} #{@vmx} #{args}")
     end
 
     def running?
       vms = list
       if @platform == :windows
-        vms.any? { |x|
-          x.downcase == @vmx.downcase
-        }
+        vms.map! { |x| x.downcase }
+        vms.include?(@vmx.downcase)
       else
         # Handle vmx being in a symlinked dir.
         real_path = nil
@@ -154,19 +147,19 @@ module JDCMicro
       end
     end
 
-    def start!
+    def start
       run('start') unless running?
     end
 
-    def stop!
+    def stop
       run('stop') if running?
     end
 
     def self.locate(platform)
-      paths = YAML.load_file(JDCMicro.config_file('paths.yml'))
+      paths = YAML.load_file(JDC::Micro.config_file('paths.yml'))
       vmrun_paths = paths[platform.to_s]['vmrun']
       vmrun_exe = @platform == :windows ? 'vmrun.exe' : 'vmrun'
-      vmrun = JDCMicro.locate_file(vmrun_exe, "VMware", vmrun_paths)
+      vmrun = JDC::Micro.locate_file(vmrun_exe, "VMware", vmrun_paths)
       err "Unable to locate vmrun, please supply --vmrun option" unless vmrun
       vmrun
     end

data/lib/{micro → jdc}/micro.rb

@@ -1,32 +1,32 @@
 require 'find'
-require "micro/errors"
 
-module JDCMicro
+module JDC::Micro
   def config_file(file)
-    File.expand_path("../../../../config/#{file}", __FILE__)
+    File.join(File.dirname(__FILE__), '..', '..', 'config', 'micro', file)
   end
 
   def escape_path(path)
     path = File.expand_path(path)
     if RUBY_PLATFORM =~ /mingw|mswin32|cygwin/
       if path.include?(' ')
-        '"' + path + '"'
+        return '"' + path + '"'
       else
-        path
+        return path
       end
     else
-      path.gsub(' ', '\ ')
+      return path.gsub(' ', '\ ')
     end
   end
 
   def locate_file(file, directory, search_paths)
     search_paths.each do |path|
       expanded_path = File.expand_path(path)
-      next unless File.exists?(expanded_path)
-      Find.find(expanded_path) do |current|
-        if File.directory?(current) && current.include?(directory)
-          full_path = File.join(current, file)
-          return escape_path(full_path) if File.exists?(full_path)
+      if File.exists?(expanded_path)
+        Find.find(expanded_path) do |current|
+          if File.directory?(current) && current.include?(directory)
+            full_path = File.join(current, file)
+            return self.escape_path(full_path) if File.exists?(full_path)
+          end
         end
       end
     end
@@ -37,14 +37,14 @@ module JDCMicro
   def run_command(command, args=nil)
     # TODO switch to using posix-spawn instead
     result = %x{#{command} #{args} 2>&1}
-    if $?.exitstatus == 0
-      result.split(/\n/)
-    else
+    unless $?.exitstatus == 0
       if block_given?
         yield
       else
-        raise JDCMicro::MCFError, "failed to execute #{command} #{args}:\n#{result}"
+        raise "failed to execute #{command} #{args}:\n#{result}"
       end
+    else
+      result.split(/\n/)
     end
   end
 

data/lib/jdc/signature/version.rb

@@ -0,0 +1,27 @@
+#!/usr/bin/ruby
+#encoding=utf-8
+
+require File.expand_path('../../signer.rb', __FILE__)
+
+module JDC
+    module Signature
+        module Version
+
+            include JDC::Signer
+
+            def generate_signature secret_key, req
+                return sign(secret_key, string_to_sign(req))
+            end
+
+            def string_to_sign req
+                str = [
+                    req[:method],
+                    req[:headers]['Content-MD5'],
+                    req[:headers]['Content-Type'],
+                    req[:headers]['Date'],
+                    req[:headers]['Path']
+                ].join("\n")
+            end
+        end
+    end
+end

data/lib/jdc/signer.rb

@@ -0,0 +1,13 @@
+#!/usr/bin/ruby
+#encoding=utf-8
+
+require 'base64'
+require 'openssl'
+
+module JDC
+    module Signer
+        def sign secret_key, string_to_sign, digest = 'sha1'
+            return Base64.encode64(OpenSSL::HMAC.digest(digest, secret_key, string_to_sign)).strip
+        end
+    end
+end

data/lib/jdc/timer.rb

@@ -0,0 +1,12 @@
+#!/usr/bin/ruby
+#encoding=utf-8
+
+require 'time'
+
+module JDC 
+    module Timer
+        def get_time 
+            return Time.now.utc.strftime("%Y%m%dT%H%M%SZ")  
+        end
+    end
+end

data/lib/jdc.rb

@@ -1,16 +1,3 @@
-require "jdc/version"
+module JDC; end
 
-require "jdc/object_extensions"
-
-require "jdc/cli"
-
-command_files = "../jdc/cli/{app,route,domain,organization,space,service,start,user}/*.rb"
-Dir[File.expand_path(command_files, __FILE__)].each do |file|
-  require file unless File.basename(file) == 'base.rb'
-end
-
-require "manifests/plugin"
-require "admin/plugin"
-require "console/plugin"
-#require "tunnel/plugin"
-require "micro/plugin"
+require 'jdc/client'