davetron5000-gliffy 0.1.3 → 0.1.5

data/bin/gliffy

@@ -9,16 +9,23 @@ require 'gli'
 include GLI
 
 pre do |global_options,command,options,args|
-  if !Gliffy::CLIConfig.instance.load
-    raise "Problem loading config"
-  end
-  if command && command.name != :help
+  if global_options[:version]
+    puts "#{$0} v#{Gliffy::VERSION}"
+    false
+  elsif !Gliffy::CLIConfig.instance.load
+    puts "Problem loading config"
+    false
+  elsif command && command.name != :help
     previous_token = Gliffy::CLIConfig.instance.config[:current_token]
     Gliffy::Config.config.log_level = Logger::DEBUG if global_options[:v]
     $gliffy = Gliffy::Handle.new(Gliffy::CLIConfig.instance.config[:username],previous_token)
+    true
   end
 end
 
+desc 'show version'
+switch :version
+
 desc 'be more verbose'
 switch :v
 

data/lib/gliffy/cli.rb

@@ -66,10 +66,26 @@ module Gliffy
 
     # Saves the configration to the user's config file name as YAML
     def save
+      ld = @config[:log_device]
+      @config[:log_device] = log_device_to_string(ld)
       fp = File.open(@config_file_name,'w') { |out| YAML::dump(@config,out) }
+      @config[:log_device] = ld
     end
 
     private
+
+    def log_device_to_string(ld)
+      if ld == STDERR
+        'STDERR'
+      elsif ld == STDOUT
+        'STDOUT'
+      elsif !ld.kind_of?(String)
+        puts "Warning: don't know how to persist a #{ld.class.name}"
+        nil
+      else
+        ld
+      end
+    end
     def read_config_from_user(name,symbol)
       if (!@config[symbol])
         puts "No #{name} configured.  Enter #{name}"
@@ -81,7 +97,7 @@ module Gliffy
       @config_file_name = File.expand_path("~/.gliffyrc")
       @config = {
         :log_level => Gliffy::Config.config.log_level,
-        :log_device => Gliffy::Config.config.log_device.to_s,
+        :log_device => log_device_to_string(Gliffy::Config.config.log_device),
         :gliffy_app_root => Gliffy::Config.config.gliffy_app_root,
         :gliffy_rest_context => Gliffy::Config.config.gliffy_rest_context,
         :protocol => Gliffy::Config.config.protocol,

data/lib/gliffy/handle.rb

@@ -7,6 +7,7 @@ require 'gliffy/account'
 require 'gliffy/config'
 
 module Gliffy
+  VERSION = '0.1.5'
 
 
   # A "handle" to access Gliffy on a per-user-session basis

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: davetron5000-gliffy
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors: 
 - David Copeland
@@ -9,17 +9,17 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-03 00:00:00 -08:00
+date: 2009-02-05 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: technoweenie-rest-client
+  name: davetron5000-rest-client
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.5.1
+        version: 0.5.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: davetron5000-gli