jabber-tee 0.1.0 → 0.1.1

data/Rakefile

@@ -23,7 +23,7 @@ begin
     gem.version        = JabberTee::Version.to_s
     gem.executables    = %W{jabber-tee}
     gem.summary        = 'Simple command line utility for piping the output from one command to both the console and a remote jabber server.'
-    gem.description    = "Installs the 'jabber-pipe' utility for sending messages to a remote jabber server.  Instead of a standard client, it reads from standard in and continues to write to the console."
+    gem.description    = "Installs the 'jabber-tee' utility for sending messages to a remote jabber server.  Instead of a standard client, it reads from standard in and continues to write to the console."
     gem.email          = ['madeonamac@gmail.com']
     gem.authors        = ['Gabe McArthur']
     gem.homepage       = 'http://github.com/gabemc/jabber-tee'

data/lib/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/jabber-tee/cli.rb

@@ -59,32 +59,39 @@ Options:
 DESC
         opts.separator "  Connecting:"
         opts.on('-u', '--username USERNAME',
-                "The user@host.org name to connect to the jabber server.") do |u|
+                "The user@host.org name to connect",
+                "to the jabber server.") do |u|
           options[:username] = u
         end
         opts.on('-p', '--password PASSWORD',
-                "The password for the user to connect to the jabber server.",
-                "If not given or defined in the .jabber-tee.yml file,",
-                "it will be asked during runtime.") do |p|
+                "The password for the user to connect",
+                "to the jabber server.  If not given",
+                "it must be defined in your",
+                "~/.jabber-tee.yml file.") do |p|
           options[:password] = p
         end
         opts.on('-n', '--nick NICKNAME',
-                "The nickname to use when connecting to the server.") do |n|
+                "The nickname to use when connecting",
+                "to the server.") do |n|
           options[:nick] = n
         end
+=begin
         opts.on('-a', '--anonymous',
-                "Disregards the username information and logs in using anonymous",
-                "authentication.  Either the --username or the --authentication",
-                "flag are required.") do |a|
+                "Disregards the username information and",
+                "logs in using anonymous authentication.") do |a|
           options[:anonymous] = true
         end
+=end
         opts.on('-P', '--profile PROFILE',
-                "The name of the profile, as defined in the .jabber-tee.yml",
-                "file to use to connect with.") do |p|
+                "The name of the profile, as defined in",
+                "the ~/.jabber-tee.yml file to use to",
+                "connect with.") do |p|
           options[:profile] = p
         end
+=begin
         opts.on('--sasl',
-                "By default, the connection does not use SASL authentication.",
+                "By default, the connection does not",
+                "use SASL authentication.",
                 "This enables SASL connections") do |s|
           options[:sasl] = true
         end
@@ -93,6 +100,7 @@ DESC
                 "authentication mechanism.") do |d|
           options[:digest] = true
         end
+=end
         opts.separator ""
 
         opts.separator "  Output: (One required)"

data/lib/jabber-tee/configuration.rb

@@ -27,7 +27,7 @@ module JabberTee
           raise JabberTee::ConfigurationError.new("Unable to load an profiles from your home configuration.")
         end
         profile = profiles[name]
-        if config.nil?
+        if profile.nil?
           raise JabberTee::ConfigurationError.new("Unable to load the #{name} profile from your home configuration.")
         end
         config.merge(profile)
@@ -47,6 +47,7 @@ module JabberTee
     end
 
     def merge(options)
+      #self if options.nil?
       ATTRIBUTES.each do |attr|
         if options.has_key?(attr.to_sym) || options.has_key?(attr)
           value = options[attr.to_sym] || options[attr]

data/spec/cli_spec.rb

@@ -39,7 +39,7 @@ module JabberTee
       it "should parse the password correctly" do
         check(:password, ['-p', '--password'], 'super_!!_secret')
       end
-
+=begin
       it "should parse the sasl flag correctly" do
         check(:sasl, ['--sasl'], true)
       end
@@ -47,10 +47,10 @@ module JabberTee
       it "should parse the digest flag correctly" do
         check(:digest, ['--digest'], true)
       end
-
       it "should parse the anonymous flag correctly" do
         check(:anonymous, ['-a', '--anonymous'], true)
       end
+=end
 
       it "should parse the room flag correctly" do
         check(:room, ['-r', '--room'], 'ROOM')

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: jabber-tee
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Gabe McArthur
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-23 00:00:00 -07:00
+date: 2010-09-24 00:00:00 -07:00
 default_executable: jabber-tee
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -65,7 +65,7 @@ dependencies:
         version: 1.3.0
   type: :development
   version_requirements: *id003
-description: Installs the 'jabber-pipe' utility for sending messages to a remote jabber server.  Instead of a standard client, it reads from standard in and continues to write to the console.
+description: Installs the 'jabber-tee' utility for sending messages to a remote jabber server.  Instead of a standard client, it reads from standard in and continues to write to the console.
 email: 
 - madeonamac@gmail.com
 executables: