deltacloud-core 0.0.1 → 0.0.2

data/support/fedora/deltacloudd

@@ -0,0 +1,68 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+require 'optparse'
+require 'thin'
+
+options = {
+  :env => 'production'
+}
+optparse = OptionParser.new do |opts|
+
+opts.banner = <<BANNER
+Usage:
+deltacloudd -i <driver> [options]
+
+Options:
+BANNER
+  opts.on( '-i', '--driver DRIVER', 'Driver to use') do |driver|
+    ENV["API_DRIVER"] = driver
+  end
+  opts.on( '-r', '--hostname HOSTNAME',
+           'Bind to HOST address (default: localhost)') do |host|
+    ENV["API_HOST"] = host
+  end
+  opts.on( '-p', '--port PORT', 'Use PORT (default: 3001)') do |port|
+    ENV["API_PORT"] = port
+  end
+  opts.on( '-e', '--env ENV', 'Environment (default: "development")') { |env| options[:env] = env }
+  opts.on( '-h', '--help', '') { options[:help] = true }
+end
+
+optparse.parse!
+
+if options[:help]
+ puts optparse
+ exit(0)
+end
+
+unless ENV["API_DRIVER"]
+  puts "You need to specify a driver to use (-i <driver>)"
+  exit(1)
+end
+
+ENV["API_HOST"] = "localhost" unless ENV["API_HOST"]
+ENV["API_PORT"] = "3001" unless ENV["API_PORT"]
+
+dirname="#{File.dirname(__FILE__)}/.."
+
+argv_opts = ARGV.clone
+argv_opts << ['start'] unless Thin::Runner.commands.include?(options[0])
+argv_opts << ['--address', ENV["API_HOST"] ]
+argv_opts << ['--port', ENV["API_PORT"] ]
+argv_opts << ['--rackup', 'config.ru' ]
+argv_opts << ['--chdir', dirname ]
+argv_opts << ['-e', options[:env] ]
+argv_opts << ['--threaded', '-D', '--stats', '/stats']
+
+argv_opts.flatten!
+
+puts "Starting Deltacloud API :: #{ENV["API_DRIVER"]} :: http://#{ENV["API_HOST"]}:#{ENV["API_PORT"]}/api"
+puts
+
+thin = Thin::Runner.new(argv_opts)
+begin
+  thin.run!
+rescue Exception => e
+  puts "ERROR: #{e.message}"
+end

data/support/fedora/rubygem-deltacloud-core.spec

@@ -0,0 +1,91 @@
+%global ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
+%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
+%global gemname deltacloud-core
+%global geminstdir %{gemdir}/gems/%{gemname}-%{version}
+
+Summary: Deltacloud REST API
+Name: rubygem-%{gemname}
+Version: 0.0.1
+Release: 2%{?dist}
+Group: Development/Languages
+License: ASL 2.0 and MIT
+URL: http://www.deltacloud.org
+Source0: http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires: rubygems
+Requires: ruby(abi) = 1.8
+Requires: rubygem(eventmachine) >= 0.12.10
+Requires: rubygem(haml) >= 2.2.17
+Requires: rubygem(sinatra) >= 0.9.4
+Requires: rubygem(rack) >= 1.0.0
+Requires: rubygem(thin) >= 1.2.5
+Requires: rubygem(builder) >= 2.1.2
+Requires: rubygem(json) >= 1.2.3
+BuildRequires: ruby-json >= 1.1.9
+BuildRequires: rubygem(rake) >= 0.8.7
+BuildRequires: rubygem(rack-test) >= 0.4.0
+BuildRequires: rubygem(cucumber) >= 0.4.0
+BuildRequires: rubygem(rcov) >= 0.9.6
+BuildRequires: rubygems
+BuildRequires: ruby(abi) = 1.8
+BuildArch: noarch
+Provides: rubygem(%{gemname}) = %{version}
+
+%description
+The Deltacloud API is built as a service-based REST API.
+You do not directly link a Deltacloud library into your program to use it.
+Instead, a client speaks the Deltacloud API over HTTP to a server
+which implements the REST interface.
+
+%prep
+
+%build
+
+%install
+rm -rf %{buildroot}
+mkdir -p %{buildroot}%{gemdir}
+gem install --local --install-dir %{buildroot}%{gemdir} \
+            --force --rdoc %{SOURCE0}
+mkdir -p %{buildroot}/%{_bindir}
+mv %{buildroot}%{geminstdir}/support/fedora/deltacloudd %{buildroot}/%{geminstdir}/bin
+mv %{buildroot}%{gemdir}/bin/* %{buildroot}/%{_bindir}
+rmdir %{buildroot}%{gemdir}/bin
+find %{buildroot}%{geminstdir}/bin -type f | xargs chmod a+x
+
+# Needs json_pure gem / not available in Fedora yet
+#%check
+#pushd %{buildroot}%{geminstdir}
+#cucumber features/*.feature
+#popd
+
+%clean
+rm -rf %{buildroot}
+
+%files
+%defattr(-, root, root, -)
+%{_bindir}/deltacloudd
+%{gemdir}/gems/%{gemname}-%{version}/bin
+%{gemdir}/gems/%{gemname}-%{version}/lib
+%{gemdir}/gems/%{gemname}-%{version}/public/favicon.ico
+%{gemdir}/gems/%{gemname}-%{version}/public/images
+%{gemdir}/gems/%{gemname}-%{version}/public/stylesheets
+%{gemdir}/gems/%{gemname}-%{version}/tests
+%{gemdir}/gems/%{gemname}-%{version}/views
+%{gemdir}/gems/%{gemname}-%{version}/Rakefile
+%{gemdir}/gems/%{gemname}-%{version}/*.rb
+%{gemdir}/gems/%{gemname}-%{version}/config.ru
+%doc %{gemdir}/gems/%{gemname}-%{version}/support/fedora
+%doc %{gemdir}/gems/%{gemname}-%{version}/COPYING
+%doc %{gemdir}/doc/%{gemname}-%{version}
+%{gemdir}/cache/%{gemname}-%{version}.gem
+%{gemdir}/specifications/%{gemname}-%{version}.gemspec
+# MIT
+%{gemdir}/gems/%{gemname}-%{version}/public/javascripts
+
+%changelog
+* Mon Apr 26 2010 Michal Fojtik <mfojtik@packager> - 0.0.1-1
+- Initial package
+
+* Mon Apr 26 2010 Michal Fojtik <mfojtik@packager> - 0.0.1-2
+- Fixed broken dependencies
+- Added new launcher for Fedora

data/views/instances/index.html.haml

@@ -26,4 +26,5 @@
         %td
           = instance.state
         %td
-          = instance.actions.collect { |a| link_to(a, self.send("#{a}_instance_url", instance.id), :method => :post)}.join(' ')
+          -instance.actions.each do |action|
+            =link_to action, self.send(:"#{action}_instance_url", instance.id), :class => instance_action_method(action)

data/views/instances/index.xml.haml

@@ -14,10 +14,10 @@
           %property{:kind => 'fixed', :name => p, :value => v, :unit => Deltacloud::HardwareProfile::unit(p)}
       %actions
         - instance.actions.compact.each do |action|
-          %link{:rel => action, :href => self.send("#{action}_instance_url", instance.id)}
-      - haml_tag :"public-addresses" do
+          %link{:rel => action, :href => self.send("#{action}_instance_url", instance.id), :method => instance_action_method(action)}
+      %public-addresses
         - instance.public_addresses.each do |address|
           %address  #{address}
-      - haml_tag :"private-addresses" do
+      %private-addresses
         - instance.private_addresses.each do |address|
           %address  #{address}

data/views/instances/new.html.haml

@@ -5,9 +5,15 @@
 
 %form{ :action => instances_url, :method => :post }
   %input{ :name => :image_id, :type => :hidden, :value => @instance.image_id }/
-  %label
-    Instance Name:
-  %input{ :name => 'name', :size => 30 }/
+  %p
+    %label
+      Instance Name:
+      %input{ :name => 'name', :size => 30 }/
+  -if driver_has_feature?(:authentication_key)
+    %p
+      %label
+        Instance Keyname:
+        %input{:name => 'keyname', :size => 30 }
   - if !@hardware_profiles.empty?
     %h3 What size machine?
     - for hwp in @hardware_profiles

data/views/instances/show.html.haml

@@ -39,4 +39,5 @@
   %di
     %dt
     %dd
-      = @instance.actions.collect { |action| link_to(action, "/api/instances/#{@instance.id}/#{action}") }.join(" ")
+      -@instance.actions.each do |action|
+        =link_to action, self.send(:"#{action}_instance_url", @instance.id), :class => instance_action_method(action)

data/views/instances/show.xml.haml

@@ -17,12 +17,25 @@
       %property{:kind => 'fixed', :name => p, :value => v, :unit => Deltacloud::HardwareProfile::unit(p)}
   %actions
     - @instance.actions.compact.each do |instance_action|
-      %link{:rel => instance_action, :href => self.send("#{instance_action}_instance_url", @instance.id)}
-  - haml_tag :"public-addresses" do
+      %link{:rel => instance_action, :method => instance_action_method(instance_action), :href => self.send("#{instance_action}_instance_url", @instance.id)}
+  %public-addresses
     - @instance.public_addresses.each do |address|
       %address<
         =address
-  - haml_tag :"private-addresses" do
+  %private-addresses
     - @instance.private_addresses.each do |address|
       %address<
         =address
+  - if driver_has_auth_features?
+    %authentication{ :type => driver_auth_feature_name }
+      - if @instance.authn_feature_failed?
+        %error  #{@instance.authn_error}
+      - else
+        - if driver_auth_feature_name == 'password'
+          %login
+            %username #{@instance.username}
+            %password #{@instance.password}
+        - if driver_auth_feature_name == 'key'
+          %login
+            %keyname #{@instance.keyname}
+

data/views/layout.html.haml

@@ -8,6 +8,8 @@
     /[if lt IE 8]
       = stylesheet_link_tag '/stylesheets/compiled/ie.css', :media => 'screen, projection'
     = stylesheet_link_tag '/stylesheets/compiled/application.css', :media => 'screen, projection'
+    %script{:type => "text/javascript", :src => "/javascripts/jquery-1.4.2.min.js" }
+    %script{:type => "text/javascript", :src => "/javascripts/application.js" }
   %body
     #wrapper
       #header

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: deltacloud-core
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Red Hat, Inc.
@@ -9,19 +9,9 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-23 00:00:00 +02:00
+date: 2010-06-09 00:00:00 +02:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rake
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.8.7
-    version: 
 - !ruby/object:Gem::Dependency 
   name: eventmachine
   type: :runtime
@@ -73,44 +63,34 @@ dependencies:
         version: 1.2.5
     version: 
 - !ruby/object:Gem::Dependency 
-  name: rerun
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.5.2
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: builder
+  name: json
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.1.2
+        version: 1.2.3
     version: 
 - !ruby/object:Gem::Dependency 
-  name: json
+  name: rerun
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.3
+        version: 0.5.2
     version: 
 - !ruby/object:Gem::Dependency 
-  name: rack-accept-media-types
-  type: :runtime
+  name: rake
+  type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0.9"
+        version: 0.8.7
     version: 
 - !ruby/object:Gem::Dependency 
   name: compass
@@ -175,10 +155,13 @@ files:
 - config.ru
 - server.rb
 - deltacloud.rb
-- lib/converters/xml_converter.rb
+- support/fedora/deltacloudd
+- support/fedora/rubygem-deltacloud-core.spec
+- lib/drivers.rb
 - lib/deltacloud/base_driver.rb
 - lib/deltacloud/base_driver/base_driver.rb
 - lib/deltacloud/base_driver/features.rb
+- lib/deltacloud/base_driver/mock_driver.rb
 - lib/deltacloud/drivers/ec2/ec2_driver.rb
 - lib/deltacloud/drivers/ec2/ec2_mock_driver.rb
 - lib/deltacloud/drivers/gogrid/gogrid_client.rb
@@ -190,8 +173,9 @@ files:
 - lib/deltacloud/drivers/rackspace/rackspace_client.rb
 - lib/deltacloud/drivers/rackspace/rackspace_driver.rb
 - lib/deltacloud/drivers/rhevm/rhevm_driver.rb
-- lib/deltacloud/drivers/rimu/rimu_hosting_client.rb
-- lib/deltacloud/drivers/rimu/rimu_hosting_driver.rb
+- lib/deltacloud/drivers/terremark/terremark_driver.rb
+- lib/deltacloud/drivers/rimuhosting/rimuhosting_client.rb
+- lib/deltacloud/drivers/rimuhosting/rimuhosting_driver.rb
 - lib/deltacloud/hardware_profile.rb
 - lib/deltacloud/helpers.rb
 - lib/deltacloud/helpers/application_helper.rb
@@ -206,12 +190,13 @@ files:
 - lib/deltacloud/models/instance_profile.rb
 - lib/deltacloud/state_machine.rb
 - lib/deltacloud/validation.rb
+- lib/deltacloud/method_serializer.rb
 - lib/sinatra/lazy_auth.rb
 - lib/sinatra/rabbit.rb
 - lib/sinatra/respond_to.rb
 - lib/sinatra/static_assets.rb
 - lib/sinatra/url_for.rb
-- lib/drivers.rb
+- lib/sinatra/accept_media_types.rb
 - views/accounts/index.html.haml
 - views/accounts/show.html.haml
 - views/api/show.html.haml
@@ -264,10 +249,7 @@ files:
 - public/images/rails.png
 - public/images/topbar-bg.png
 - public/javascripts/application.js
-- public/javascripts/controls.js
-- public/javascripts/dragdrop.js
-- public/javascripts/effects.js
-- public/javascripts/prototype.js
+- public/javascripts/jquery-1.4.2.min.js
 - public/stylesheets/compiled/application.css
 - public/stylesheets/compiled/ie.css
 - public/stylesheets/compiled/print.css

data/lib/converters/xml_converter.rb

@@ -1,133 +0,0 @@
-#
-# Copyright (C) 2009  Red Hat, Inc.
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-module Converters
-
-  ( ALIASES = {
-    :owner=>nil,
-    :volume=>:storage_volume,
-  } ) unless defined?( ALIASES )
-
-  def self.url_type(type)
-    type = type.to_sym
-    return ALIASES[type] if ( ALIASES.keys.include?( type ) )
-    type
-  end
-
-  def self.tag_name(type)
-    tag_name = type.to_s
-    tag_name.gsub( /_/, '-' )
-  end
-
-  class XMLConverter
-    def initialize(link_builder, type)
-      @link_builder = link_builder
-      @type         = type
-    end
-
-    def convert(obj, builder=nil)
-      builder ||= Builder::XmlMarkup.new( :indent=>2 )
-      if ( obj.is_a?( Array ) )
-        builder.__send__( @type.to_s.pluralize.gsub( /_/, '-' ).to_sym ) do
-          obj.each do |e|
-            convert( e, builder )
-          end
-        end
-      else
-        case ( obj )
-          when Image
-            builder.image( :href=>@link_builder.send( :image_url, obj.id ) ) {
-              builder.id( obj.id )
-              builder.owner_id( obj.owner_id )
-              builder.name( obj.name )
-              builder.description( obj.description )
-              builder.architecture( obj.architecture )
-            }
-          when Realm
-            builder.realm( :href=>@link_builder.send( :realm_url, obj.id ) ) {
-              builder.id( obj.id )
-              builder.name( obj.name )
-              builder.state( obj.state )
-              if ( obj.limit == :unlimited )
-                builder.limit()
-              else
-                builder.limit( obj.limit )
-              end
-            }
-          when Instance
-            builder.instance( :href=>@link_builder.send( :instance_url, obj.id ) ) {
-              builder.id( obj.id )
-              builder.name( obj.name )
-              builder.owner_id( obj.owner_id )
-              builder.image( :href=>@link_builder.send( :image_url, obj.image_id ) )
-              builder.__send__( 'hardware-profile', :href=>@link_builder.send( :hardware_profile_url, obj.instance_profile.name) ) do
-                builder.id( obj.instance_profile.name )
-                obj.instance_profile.overrides.each do |p, v|
-                  u = ::Deltacloud::HardwareProfile::unit(p)
-                  builder.property( :kind=>:fixed, :name=>p, :unit=>u, :value=>v )
-                end
-              end
-              builder.realm( :href=>@link_builder.send( :realm_url, obj.realm_id ) ) if obj.realm_id
-              builder.state( obj.state )
-              builder.actions {
-                if ( obj.actions )
-                  obj.actions.each do |action|
-                    builder.link( :rel=>action, :href=>@link_builder.send( "#{action}_instance_url", obj.id ) )
-                  end
-                end
-              }
-              builder.__send__( 'public-addresses' ) {
-                obj.public_addresses.each do |address|
-                  builder.address( address )
-                end
-              }
-              builder.__send__( 'private-addresses' ) {
-                obj.private_addresses.each do |address|
-                  builder.address( address )
-                end
-              }
-            }
-          when StorageVolume
-            builder.__send__('storage-volume', :href=>@link_builder.send( :storage_volume_url, obj.id )) {
-              builder.id( obj.id )
-              builder.created( obj.created )
-              builder.state( obj.state )
-              builder.capacity( obj.capacity )
-              builder.device( obj.device )
-              if ( obj.instance_id )
-                builder.instance( :href=>@link_builder.send( :instance_url, obj.instance_id ) )
-              else
-                builder.instance()
-              end
-            }
-          when StorageSnapshot
-            builder.__send__('storage-snapshot', :href=>@link_builder.send( :storage_snapshot_url, obj.id )) {
-              builder.id( obj.id )
-              builder.created( obj.created )
-              builder.state( obj.state )
-              if ( obj.storage_volume_id )
-                builder.__send__('storage-volume', :href=>@link_builder.send( :storage_volume_url, obj.storage_volume_id ) )
-              else
-                builder.__send( 'storage-volume' )
-              end
-            }
-        end
-      end
-      return builder.target!
-    end
-  end
-end