BlueAdmiral 0.0.2 → 0.0.3

data/BlueAdmiral.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{BlueAdmiral}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Love"]
@@ -58,6 +58,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<json>, [">= 0"])
       s.add_runtime_dependency(%q<cli>, [">= 0"])
       s.add_runtime_dependency(%q<cri>, [">= 0"])
+      s.add_runtime_dependency(%q<facets>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.0"])
       s.add_development_dependency(%q<yard>, ["~> 0.6.0"])
@@ -70,6 +71,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<json>, [">= 0"])
       s.add_dependency(%q<cli>, [">= 0"])
       s.add_dependency(%q<cri>, [">= 0"])
+      s.add_dependency(%q<facets>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.0"])
       s.add_dependency(%q<yard>, ["~> 0.6.0"])
@@ -83,6 +85,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<json>, [">= 0"])
     s.add_dependency(%q<cli>, [">= 0"])
     s.add_dependency(%q<cri>, [">= 0"])
+    s.add_dependency(%q<facets>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.0"])
     s.add_dependency(%q<yard>, ["~> 0.6.0"])

data/Gemfile

@@ -22,6 +22,9 @@ gem "json"
 gem "cli"
 gem "cri"
 
+# Additional routines for the core classes
+gem "facets"
+
 ###
 ### Development Gems. All _additional_ gems required by development (as apposed to
 ###                   production environments). If it is required at run-time, it

data/Gemfile.lock

@@ -7,6 +7,7 @@ GEM
     em-synchrony (0.2.0)
       eventmachine (>= 0.12.9)
     eventmachine (0.12.10)
+    facets (2.9.1)
     git (1.2.5)
     hiredis (0.3.1)
     jeweler (1.6.0)
@@ -35,6 +36,7 @@ DEPENDENCIES
   cli
   cri
   em-synchrony
+  facets
   hiredis (~> 0.3.1)
   jeweler (~> 1.6.0)
   json

data/README.rdoc

@@ -14,6 +14,6 @@ Description goes here.
 
 == Copyright
 
-Copyright (c) 2011 David Love. See LICENSE.txt for
+Copyright (c) 2011 David Love. See LICENSE for
 further details.
 

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/lib/mercury/cli/commands/bootstrap.rb

@@ -79,7 +79,23 @@ module Mercury::CLI::Commands
 
     # Execute the command
     def run(options, arguments)
-      return
+      
+      # The first thing we need to do is to find the relevant server. So we 
+      # check the options and see if they can help
+      unless options[:server].nil? or options[:server].empty? then
+        #
+      else
+      
+        # The user has not specified a server, so we will attempt to get one
+        # from the system configuration
+        if File.exists?("/etc/mercury.conf") then
+          #
+        
+        # Everything has failed, so we abort        
+        else
+          Mercury::CLI::Logger.instance.log_level(:high, :error, "Cannot locate a Mercury server. Either specify the server to connect to using the 'server' option, or create an appropriate configuration file.")
+        end
+      end  
     end
 
   end

data/lib/mercury/cli/logger.rb

@@ -1,19 +1,20 @@
-### Copyright (c) 2009 Denis Defreyne, 2010-2011 David Love
-###
-### Permission to use, copy, modify, and/or distribute this software for 
-### any purpose with or without fee is hereby granted, provided that the 
-### above copyright notice and this permission notice appear in all copies.
-###
-### THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES 
-### WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF 
-### MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR 
-### ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES 
-### WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN 
-### ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 
-### OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-###
+# Copyright (c) 2009 Denis Defreyne, 2010-2011 David Love
+#
+# Permission to use, copy, modify, and/or distribute this software for 
+# any purpose with or without fee is hereby granted, provided that the 
+# above copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES 
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF 
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR 
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES 
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN 
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 
+# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
 
 require 'singleton'
+require 'facets'
 
 module Mercury::CLI
 
@@ -24,11 +25,9 @@ module Mercury::CLI
     # ANSI console codes (escape sequences) for highlighting particular
     # log outputs.
     ACTION_COLORS = {
-      :create         => "\e[1m" + "\e[32m", # bold + green
-      :update         => "\e[1m" + "\e[33m", # bold + yellow
-      :identical      => "\e[1m",            # bold
-      :skip           => "\e[1m",            # bold
-      :'not written'  => "\e[1m"             # bold
+      :error          => "\e[1m" + "\e[31m", # bold + red
+      :warning        => "\e[1m" + "\e[33m", # bold + yellow
+      :info           => "\e[1m" + "\e[32m", # bold + green
     }
 
     include Singleton
@@ -47,23 +46,23 @@ module Mercury::CLI
       @color = true
     end
 
-    # Logs a file-related action.
+    # Logs a messsage, using appropriate colours to highlight different
+    # levels.
     #
     # +level+:: The importance of this action. Can be :high or :low.
     #
     # +action+:: The kind of file action. Can be :create, :update or
     #            :identical.
     #
-    # +identifier+:: The identifier of the item the action was performed on.
-    def file(level, action, identifier, duration=nil)
+    # +message+:: The identifier of the item the action was performed on.
+    def log_level(level, action, message)
       log(
         level,
-        '%s%12s%s  %s%s' % [
+        '%s%12s%s:  %s' % [
           color? ? ACTION_COLORS[action.to_sym] : '',
-          action,
+          action.capitalize,
           color? ? "\e[0m" : '',
-          duration.nil? ? '' : "[%2.2fs]  " % [ duration ],
-          identifier
+          message.word_wrap(60).indent(15).lstrip
         ]
       )
     end
@@ -72,16 +71,16 @@ module Mercury::CLI
     #
     # +level+:: The importance of this message. Can be :high or :low.
     #
-    # +s+:: The message to be logged.
+    # +message+:: The message to be logged.
     #
     # +io+:: The IO instance to which the message will be written. Defaults to
     #        standard output.
-    def log(level, s, io=$stdout)
+    def log(level, message, io=$stdout)
       # Don't log when logging is disabled
       return if @level == :off
 
       # Log when level permits it
-      io.puts(s) if (@level == :low or @level == level)
+      io.puts(message) if (@level == :low or @level == level)
     end
 
   end

metadata

@@ -2,7 +2,7 @@
 name: BlueAdmiral
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - David Love
@@ -80,8 +80,19 @@ dependencies:
   prerelease: false
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: bundler
+  name: facets
   requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: bundler
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -89,10 +100,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *id007
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -100,10 +111,10 @@ dependencies:
         version: 1.6.0
   type: :development
   prerelease: false
-  version_requirements: *id008
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: yard
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -111,10 +122,10 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *id009
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -122,10 +133,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *id010
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: rcov
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -133,7 +144,7 @@ dependencies:
         version: "0"
   type: :development
   prerelease: false
-  version_requirements: *id011
+  version_requirements: *id012
 description: Prepares hosts/networks/etc to become part of a stated Mercury environment
 email: david@homeunix.org.uk
 executables: 
@@ -180,7 +191,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -976333998919963703
+      hash: -3823986487516873675
       segments: 
       - 0
       version: "0"