aeolus-image 0.4.0 → 0.5.1

data/.rspec

@@ -0,0 +1,2 @@
+--colour
+--format nested

data/README.md

@@ -0,0 +1,36 @@
+# aeolus-image-rubygem #
+**aeolus-image-rubygem** is a Ruby library used by [Conductor](https://github.com/aeolusproject/conductor) to connect with Image Factory and Image Warehouse.
+
+It provides a gem named **aeolus-image**, which shouldn't be confused with the [aeolus-image](https://github.com/aeolusproject/aeolus-image) command-line tool. (There's talk of renaming these shortly to alleviate this confusion.)
+
+## Configuration ##
+aeolus-image-rubygem is meant to be leveraged in code. You might check out [config/initializers/aeolus-image.rb](https://github.com/aeolusproject/conductor/blob/master/src/config/initializers/aeolus-image.rb) in Conductor for an example.
+
+## Usage ##
+After configurating Factory and/or Warehouse hosts, you can do things like the following:
+
+### Warehouse ###
+
+~~~
+   images = Aeolus::Image::Warehouse::Image.all
+   
+   image1 = images.first
+   image1.name # => ""
+   image1.image_builds # => an array of ImageBuild objects
+~~~
+
+### Factory ###
+
+~~~
+   builds_in_progress = Aeolus::Image::Factory::Builder.all
+~~~
+
+#### Start a build with Factory ####
+
+~~~
+   img = Aeolus::Image::Factory::Image.new(
+    :targets => 'ec2',
+    :template => IO.read('/home/mawagner/template.tpl')
+   )
+   img.save!
+~~~

data/Rakefile

@@ -24,25 +24,28 @@ require './rake/rpmtask'
 RPMBUILD_DIR = "#{File.expand_path('~')}/rpmbuild"
 RPM_SPEC = "rubygem-aeolus-image.spec"
 RPM_SPEC_IN = "rubygem-aeolus-image.spec.in"
-PKG_VERSION = "0.4.0"
+PKG_VERSION = "0.5.1"
 
 spec = Gem::Specification.new do |s|
-  s.name = 'aeolus-image'
-  s.version = PKG_VERSION
-  s.summary= 'Ruby Client for Image Warehouse and Image Factory for the Aeolus cloud suite'
-  s.description = 'Library for managing image via the Factory and Warehouse projects for the aeolus cloud management suite'
-  s.author = 'Jason Guiditta, Martyn Taylor'
-  s.email = 'jguiditt@redhat.com, mtaylor@redhat.com'
-  s.license = 'ASL 2.0'
-  s.homepage = 'http://aeolusproject.org'
-  s.files = %w(Rakefile) + Dir.glob("{lib,spec}/**/*") + %w(COPYING)
+  s.name         = 'aeolus-image'
+  s.version      = PKG_VERSION
+  s.platform     = Gem::Platform::RUBY
+  s.authors      = 'Jason Guiditta, Martyn Taylor'
+  s.email        = 'jguiditt@redhat.com, mtaylor@redhat.com'
+  s.license      = 'ASL 2.0'
+  s.homepage     = "https://github.com/aeolusproject/aeolus-image-rubygem"
+  s.summary      = 'Ruby Client for Image Warehouse and Image Factory for the Aeolus cloud suite'
+  s.description  = "aeolus-image is a Ruby library used by Conductor to connect with Image Factory and Image Warehouse."
+
+  s.files        = Dir["lib/**/*.rb","README.md","COPYING","Rakefile","rake/rpmtask.rb"]
+  s.test_files   = Dir["spec/**/*.*",".rspec","examples/aeolus-cli"]
   s.require_path = "lib"
-  s.add_dependency('nokogiri', '>=0.4.0')
-  s.add_dependency('rest-client')
-  s.add_dependency('activeresource', '~>3.0.10')
+  s.add_dependency('activeresource')
+  s.add_dependency('nokogiri')
   s.add_dependency('oauth')
+  s.add_dependency('rest-client')
 
-  s.add_development_dependency('rspec', '~>1.3.0')
+  s.add_development_dependency('rspec', '>=1.3.0')
 end
 
 Gem::PackageTask.new(spec) do |p|

data/examples/aeolus-cli

@@ -0,0 +1,9 @@
+
+# Below is the correct format for this file, please update any older version you may have
+:iwhd:
+  :url: http://localhost:9090
+
+:conductor:
+  :url: http://localhost:3000/conductor
+  :username: admin
+  :password: password

data/lib/aeolus_image/active_resource_oauth_client.rb

@@ -26,7 +26,7 @@ module ActiveResourceOAuthClient
     def request_with_oauth(method, path, *arguments)
       @oauth_config = Aeolus::Image::Factory::Base.config || {}
       # Take care to fall back to the standard request method if we don't have full OAuth credentials
-      unless Aeolus::Image::Factory::Base.use_oauth?
+      unless use_oauth_for_url?("#{site.scheme}://#{site.host}:#{site.port}#{path}")
         return request_without_oauth(method, path, *arguments)
       end
       result = ActiveSupport::Notifications.instrument("request.active_resource") do |payload|
@@ -56,6 +56,12 @@ module ActiveResourceOAuthClient
         raise SSLError.new(e.message)
     end
 
+    # Currently, only Factory calls should use OAuth -- extend as needed
+    def use_oauth_for_url?(url)
+      Aeolus::Image::Factory::Base.use_oauth? and
+        url.include?(Aeolus::Image::Factory::Base.config[:site])
+    end
+
     alias_method_chain :request, :oauth
 
   end

data/rake/rpmtask.rb

@@ -0,0 +1,126 @@
+#   Copyright 2011 Red Hat, Inc.
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+# Define a package task library to aid in the definition of RPM
+# packages.
+
+require 'rubygems'
+require 'rake'
+require 'rake/packagetask'
+
+require 'rbconfig' # used to get system arch
+
+module Rake
+
+  # Create a package based upon a RPM spec.
+  # RPM packages, can be produced by this task.
+  class RpmTask < PackageTask
+    # filename for output RPM spec
+    attr_accessor :rpm_spec
+
+    # RPM build dir
+    attr_accessor :topdir
+
+    # Include extra_release information in the rpm
+    attr_accessor :include_extra_release
+
+    def initialize(rpm_spec, args = {})
+      init(rpm_spec,args)
+      yield self if block_given?
+      define if block_given?
+    end
+
+    def init(rpm_spec,args)
+      @rpm_spec = rpm_spec
+      
+      if args[:suffix]
+        rpm_spec_in = @rpm_spec + args[:suffix]
+        @include_extra_release = eval `grep -q '^[[:space:]]*Release:[[:space:]]*0' #{rpm_spec_in} && echo true || echo false`
+
+        git_head = `git log -1 --pretty=format:%h`
+        extra_release = @include_extra_release ? ("." + Time.now.strftime("%Y%m%d%H%M%S").gsub(/\s/, '') + "git" + "#{git_head}") : ''
+
+        if args[:pkg_version]
+          pkg_version = args[:pkg_version]
+          `sed -e "s|@VERSION@|#{pkg_version}|;s|^\\(Release:[^%]*\\)|\\1#{extra_release}|" #{rpm_spec_in} > #{@rpm_spec}`
+        else
+          `sed -e "s|^\\(Release:[^%]*\\)|\\1#{extra_release}|" #{rpm_spec_in} > #{@rpm_spec}`
+        end
+      end
+
+      # parse this out of the rpmbuild macros,
+      # not ideal but better than hardcoding this
+      File.open('/etc/rpm/macros.dist', "r") { |f|
+        f.read.scan(/%dist\s*\.(.*)\n/)
+        @distro = $1
+      }
+
+      # Parse rpm name / version out of spec
+      # FIXME hacky way to do this for now
+      #   (would be nice to implement a full blown rpm spec parser for ruby)
+      File.open(rpm_spec, "r") { |f|
+        contents = f.read
+        # Parse out definitions and crudely expand them
+        contents.scan(/%define .*\n/).each do |definition|
+          words = definition.strip.split(' ')
+          key = words[1]
+          value = words[2..-1].to_s
+          # Modify the contents with expanded values, unless they contain
+          # a shell command (since we're not modifying them)
+          contents.gsub!("%{#{key}}", value) unless value.match('%\(')
+        end
+        @name    = contents.scan(/\nName: .*\n/).first.split.last
+        @version = contents.scan(/\nVersion: .*\n/).first.split.last
+        @release = contents.scan(/\nRelease: .*\n/).first.split.last
+        @release.gsub!("%{?dist}", ".#{@distro}")
+        @arch    =  contents.scan(/\nBuildArch: .*\n/) # TODO grab local arch if not defined
+        if @arch.nil?
+          @arch = Config::CONFIG["target_cpu"] # hoping this will work for all cases,
+                                               # can just run the 'arch' cmd if we want
+        else
+          @arch = @arch.first.split.last
+        end
+      }
+      super(@name, @version)
+
+      @rpmbuild_cmd = 'rpmbuild'
+    end
+
+    def define
+      super
+
+      directory "#{@topdir}/SOURCES"
+      directory "#{@topdir}/SPECS"
+
+      desc "Build the rpms"
+      task :rpms, [:include_extra_release] => [rpm_file]
+
+      # FIXME properly determine :package build artifact(s) to copy to sources dir
+      file rpm_file, [:include_extra_release] => [:package, "#{@topdir}/SOURCES", "#{@topdir}/SPECS"] do |t,args|
+        cp "#{package_dir}/#{@name}-#{@version}.tgz", "#{@topdir}/SOURCES/"
+        # FIXME - This seems like a hack, but we don't know the gem's name
+	cp "#{package_dir}/#{@name.gsub('rubygem-', '')}-#{@version}.gem", "#{@topdir}/SOURCES/"
+        cp @rpm_spec, "#{@topdir}/SPECS"
+        sh "#{@rpmbuild_cmd} " +
+           "--define '_topdir #{@topdir}' " +
+           "-ba #{@rpm_spec}"
+      end
+    end
+
+    def rpm_file
+      # FIXME support all a spec's subpackages as well
+      "#{@topdir}/RPMS/#{@arch}/#{@name}-#{@version}-#{@release}.#{@arch}.rpm"
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: aeolus-image
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 9
   prerelease: 
   segments: 
   - 0
-  - 4
-  - 0
-  version: 0.4.0
+  - 5
+  - 1
+  version: 0.5.1
 platform: ruby
 authors: 
 - Jason Guiditta, Martyn Taylor
@@ -15,26 +15,24 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-09 00:00:00 Z
+date: 2012-08-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: nokogiri
+  name: activeresource
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 3
         segments: 
         - 0
-        - 4
-        - 0
-        version: 0.4.0
+        version: "0"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rest-client
+  name: nokogiri
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -48,23 +46,21 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: activeresource
+  name: oauth
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 3
         segments: 
-        - 3
         - 0
-        - 10
-        version: 3.0.10
+        version: "0"
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: oauth
+  name: rest-client
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -83,7 +79,7 @@ dependencies:
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         hash: 27
         segments: 
@@ -93,7 +89,7 @@ dependencies:
         version: 1.3.0
   type: :development
   version_requirements: *id005
-description: Library for managing image via the Factory and Warehouse projects for the aeolus cloud management suite
+description: aeolus-image is a Ruby library used by Conductor to connect with Image Factory and Image Warehouse.
 email: jguiditt@redhat.com, mtaylor@redhat.com
 executables: []
 
@@ -102,7 +98,6 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- Rakefile
 - lib/aeolus_image/model/factory/build.rb
 - lib/aeolus_image/model/factory/provider_image.rb
 - lib/aeolus_image/model/factory/builder.rb
@@ -120,6 +115,10 @@ files:
 - lib/aeolus_image/import.rb
 - lib/aeolus_image/active_resource_oauth_client.rb
 - lib/aeolus_image.rb
+- README.md
+- COPYING
+- Rakefile
+- rake/rpmtask.rb
 - spec/vcr_setup.rb
 - spec/aeolus_image/model/factory/provider_image_spec.rb
 - spec/vcr/cassettes/oauth_fail_invalid.yml
@@ -141,8 +140,9 @@ files:
 - spec/models/warehouse/provider_image_spec.rb
 - spec/fixtures/invalid_template.tdl
 - spec/fixtures/valid_template.tdl
-- COPYING
-homepage: http://aeolusproject.org
+- .rspec
+- examples/aeolus-cli
+homepage: https://github.com/aeolusproject/aeolus-image-rubygem
 licenses: 
 - ASL 2.0
 post_install_message: 
@@ -175,5 +175,27 @@ rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Ruby Client for Image Warehouse and Image Factory for the Aeolus cloud suite
-test_files: []
-
+test_files: 
+- spec/vcr_setup.rb
+- spec/aeolus_image/model/factory/provider_image_spec.rb
+- spec/vcr/cassettes/oauth_fail_invalid.yml
+- spec/vcr/cassettes/oauth.yml
+- spec/vcr/cassettes/oauth_success_valid.yml
+- spec/vcr/cassettes/builder.yml
+- spec/vcr/cassettes/oauth_fail_no.yml
+- spec/spec_helper.rb
+- spec/models/factory/base_spec.rb
+- spec/models/factory/builder_spec.rb
+- spec/models/factory/target_image_spec.rb
+- spec/models/factory/provider_image_spec.rb
+- spec/models/warehouse/warehouse_client_spec.rb
+- spec/models/warehouse/image_spec.rb
+- spec/models/warehouse/template_spec.rb
+- spec/models/warehouse/image_build_spec.rb
+- spec/models/warehouse/target_image_spec.rb
+- spec/models/warehouse/warehouse_model_spec.rb
+- spec/models/warehouse/provider_image_spec.rb
+- spec/fixtures/invalid_template.tdl
+- spec/fixtures/valid_template.tdl
+- .rspec
+- examples/aeolus-cli