server-blender-manifest 0.0.14 → 0.0.15

data/VERSION

@@ -1 +1 @@
-0.0.14
+0.0.15

data/lib/blender/manifest/root.rb

@@ -1,4 +1,7 @@
 require 'ruby-debug'
+require 'shadow_puppet'
+require 'puppet/darwinport_fix'
+require 'puppet/dmgapp'
 
 module Blender
   module Manifest; end
@@ -7,13 +10,11 @@ module Blender
   end
 end
 
-require 'blender/manifest/init'
 require 'blender/manifest/nodes'
 require 'blender/manifest/roles'
 require 'blender/manifest/mixer'
 
 class Root < ::ShadowPuppet::Manifest
-  include Blender::Manifest::Init
   include Blender::Manifest::Nodes
   include Blender::Manifest::Roles
 
@@ -22,22 +23,66 @@ class Root < ::ShadowPuppet::Manifest
     @@mixed_recipes
   end
 
+  # Currently running operating system
+  #
+  # @return [String] name of the OS that is running
+  def os
+    Facter.value(:operatingsystem)
+  end
+
   def execute_user_recipe
-    raise "no RECIPE to execute" unless recipe = ENV['RECIPE']
+    mix "os/#{os.downcase}"
 
-    # load OS specific recipe.
-    _os = Facter.value(:operatingsystem).downcase
-    unless respond_to?(_os)
-      mix "os/#{_os}"
+    if :setup == @stage
+      # run OS specific setup recipe.
+      m = "#{os.downcase}_setup"
+      return send(m) if respond_to?(m)
     end
-    send _os
+
+    raise "no RECIPE to execute" unless recipe = ENV['RECIPE']
+
+    # run OS specific recipe.
+    m = os.downcase
+    send m if respond_to?(m)
 
     # load user's recipe
     code = open(recipe).read
     instance_eval(code, recipe)
-
   end
+
   recipe :execute_user_recipe
+
+  def initialize(stage = :execute)
+    super()
+    @stage = stage
+  end
+
+  # Create a catalog of all contained Puppet Resources and apply that
+  # catalog to the currently running system
+  def apply(bucket = nil)
+    bucket ||= export()
+    catalog = bucket.to_catalog
+    res = catalog.apply
+    catalog.clear
+    res
+  end
+
+  # Execute this manifest, applying all resources defined. Execute returns
+  # true if successfull, and false if unsucessfull. By default, this
+  # will only execute a manifest that has not already been executed?.
+  # The +force+ argument, if true, removes this check.
+  def execute(force=false)
+    return false if executed? && !force
+    evaluate_recipes
+    ! apply.any_failed?
+  rescue Exception => e
+    STDERR.puts "\n\nException: #{e}\n#{e.backtrace * "\n"}"
+    false
+  ensure
+    @executed = true
+  end
+
+
 end
 
 include Blender::Manifest::Mixer

data/lib/blender/manifest.rb

@@ -1,11 +1,11 @@
 module Blender
   module Manifest
-    ROOT = File.expand_path("../manifest/root.rb", __FILE__)
-
     # run the root manifest with shadow_puppet of the given VERSION
     # @param [String] shadow_puppet_version the version of the shadow_puppet gem to use
     def self.run(shadow_puppet_version)
-      system "shadow_puppet", "_#{shadow_puppet_version}_", ROOT
+      require 'blender/manifest/root'
+
+      Root.new(:setup).execute && Root.new.execute
     end
   end
 end

data/lib/puppet/darwinport_fix.rb

@@ -0,0 +1,96 @@
+require 'puppet/provider/package'
+
+Puppet::Type.type(:package).provide :darwinport, :parent => Puppet::Provider::Package do
+    desc "Package management using DarwinPorts on OS X."
+
+    commands :port => "/opt/local/bin/port"
+    confine :operatingsystem => "Darwin"
+
+    has_feature :versionable
+
+    def self.eachpkgashash
+        # list out all of the packages
+        open("| #{command(:port)} installed") { |process|
+            regex = %r{(\S+)\s+@(\S+)\s+(\S+)}
+            fields = [:name, :ensure, :location]
+            hash = {}
+
+            # now turn each returned line into a package object
+            process.each { |line|
+                next unless line =~ /\(active\)\s*$/ # ignore non-active packages
+                hash.clear
+
+                if match = regex.match(line)
+                    fields.zip(match.captures) { |field,value|
+                        hash[field] = value
+                    }
+
+                    hash.delete :location
+                    hash[:provider] = self.name
+                    yield hash.dup
+                else
+                    raise Puppet::DevError,
+                        "Failed to match dpkg line %s" % line
+                end
+            }
+        }
+    end
+
+    def self.instances
+        packages = []
+
+        eachpkgashash do |hash|
+            packages << new(hash)
+        end
+
+        return packages
+    end
+
+    def install
+        should = @resource.should(:ensure)
+
+        args = ["install", @resource[:name]]
+        case should
+        when true, false, Symbol
+          # pass
+        else
+          args << "@#{should}"
+        end
+        output = port(*args)
+        if output =~ /^Error: No port/
+            raise Puppet::ExecutionFailure, "Could not find package %s" % @resource[:name]
+        end
+    end
+
+    def query
+        version = nil
+        self.class.eachpkgashash do |hash|
+            if hash[:name] == @resource[:name]
+                return hash
+            end
+        end
+
+        return nil
+    end
+
+    def latest
+        info = port :list, @resource[:name]
+
+        if $? != 0 or info =~ /^Error/
+            return nil
+        end
+
+        ary = info.split(/\s+/)
+        version = ary[1].sub(/^@/, '')
+
+        return version
+    end
+
+    def uninstall
+        port :uninstall, @resource[:name]
+    end
+
+    def update
+        return install()
+    end
+end

data/lib/puppet/dmgapp.rb

@@ -0,0 +1,60 @@
+require 'puppet/provider/package'
+
+Puppet::Type.type(:package).provide :dmgapp, :parent => Puppet::Provider::Package do
+    desc "Install Apps on Mac OSX distributed using simple .dmg files with name.app inside"
+  
+    confine :exists => "/Applications"
+    confine :operatingsystem => "Darwin"
+    commands :hdiutil => "/usr/bin/hdiutil"
+
+    def self.instance_properties
+      Dir["/Applications/*.app"].map do |app_path|
+        name = File.basename(app_path)[/(.*)\.app/, 1]
+        {
+          :name => name,
+          :provider => :dmgapp,
+          :ensure => :installed
+        }
+      end
+    end
+
+    def self.instances
+      instance_properties.map {|h| new(h)}
+    end
+
+    def query
+      self.class.instance_properties.find { |h| h[:name] == name }
+    end
+
+    def install
+        source = nil
+        unless source = @resource[:source]
+            self.fail ":source required"
+        end
+        unless name = @resource[:name]
+            self.fail "missing resource name"
+        end
+
+        unless source =~ /\.dmg$/i
+            self.fail ":source must be a .dmg"
+        end
+        
+        plist = hdiutil "mount", "-plist", "-nobrowse", "-readonly", "-noidme", "-mountrandom", "/tmp", source
+        mount_dir = plist[/<string>(.*\/tmp\/.*)<\/string>/, 1]
+
+        app_file_name = "#{name}.app"
+
+        begin
+          if File.exists?(app_file_path = File.join(mount_dir, app_file_name))
+            FileUtils.cp_r app_file_path, "/Applications/"
+          else
+            self.fail "#{app_file_name} not found: #{Dir["#{mount_dir}/*"] * " "}"
+          end
+        ensure
+          hdiutil "eject", mount_dir
+        end
+    end
+end
+
+
+

data/server-blender-manifest.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{server-blender-manifest}
-  s.version = "0.0.14"
+  s.version = "0.0.15"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Vitaly Kushner"]
-  s.date = %q{2010-06-22}
+  s.date = %q{2010-07-04}
   s.description = %q{This gem is part of the server-blender family (http://astrails.com/opensource/server-blender)
 It contains server-side root manifest implementation for blender recipes. See server-blender for more information.
 }
@@ -25,11 +25,12 @@ It contains server-side root manifest implementation for blender recipes. See se
      "Rakefile",
      "VERSION",
      "lib/blender/manifest.rb",
-     "lib/blender/manifest/init.rb",
      "lib/blender/manifest/mixer.rb",
      "lib/blender/manifest/nodes.rb",
      "lib/blender/manifest/roles.rb",
      "lib/blender/manifest/root.rb",
+     "lib/puppet/darwinport_fix.rb",
+     "lib/puppet/dmgapp.rb",
      "server-blender-manifest.gemspec",
      "spec/spec.opts",
      "spec/spec_helper.rb"

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 14
-  version: 0.0.14
+  - 15
+  version: 0.0.15
 platform: ruby
 authors: 
 - Vitaly Kushner
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-22 00:00:00 +03:00
+date: 2010-07-04 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -50,11 +50,12 @@ files:
 - Rakefile
 - VERSION
 - lib/blender/manifest.rb
-- lib/blender/manifest/init.rb
 - lib/blender/manifest/mixer.rb
 - lib/blender/manifest/nodes.rb
 - lib/blender/manifest/roles.rb
 - lib/blender/manifest/root.rb
+- lib/puppet/darwinport_fix.rb
+- lib/puppet/dmgapp.rb
 - server-blender-manifest.gemspec
 - spec/spec.opts
 - spec/spec_helper.rb

data/lib/blender/manifest/init.rb

@@ -1,21 +0,0 @@
-module Blender::Manifest::Init
-  def self.included(base)
-    base.class_eval do
-      recipe :create_blender_directories
-    end
-  end
-
-  # create blender directories
-  # @return dependency ref for the direcotires creation
-  def create_blender_directories
-    @create_blender_directories ||=
-      begin
-        file name = "/var/lib/blender", :owner => "root", :mode => 0700
-        dep = file(name)
-        file name = "/var/lib/blender/logs", :owner => "root", :mode => 0755, :require => dep
-        dep = file(name)
-        file name = "/var/lib/blender/tmp", :owner => "root", :mode => 0755, :require => dep
-        dep = file(name)
-      end
-  end
-end