tyrantmanager 1.7.5 → 1.7.6

data/HISTORY.rdoc

@@ -1,4 +1,9 @@
 = Changelog
+== Version 1.7.6 2012-02-17
+
+* Update to newer versions of all dependencies
+* Cleanup ruby -w output
+
 == Version 1.7.5 2011-09-06
 
 * Update to newer versions of all dependencies

data/Rakefile

@@ -19,10 +19,10 @@ Bones {
   name    "tyrantmanager"
   authors "Jeremy Hinegardner"
   email   "jeremy@copiousfreetime.org"
-  url     "http://www.copiousfreetime.org/projects/tyrant_manager"
+  url     "https://github.com/copiousfreetime/tyrantmanager"
   version TyrantManager::VERSION
 
-  ruby_opts     %w[ -W0 -rubygems ]
+  ruby_opts     %w[ -w -rubygems ]
   readme_file   "README.rdoc"
   ignore_file   ".gitignore"
   history_file  "HISTORY.rdoc"
@@ -37,17 +37,17 @@ all on the same machine.  The commands can be applied to a single or multiple
 instances.
 _
 
-  depend_on "loquacious"  ,"~> 1.8.1"
+  depend_on "loquacious"  ,"~> 1.9.1"
   depend_on "rufus-tokyo" ,"~> 1.0.7"
   depend_on "logging"     ,"~> 1.6.1"
   depend_on "main"        ,"~> 4.6.0"
   depend_on "ffi"         ,"~> 1.0.9" #unsure why this doesn't get resolved with rufus-tokyo
 
 
-  depend_on "bones"       , "~> 3.7.1", :development
+  depend_on "bones"       , "~> 3.7.3", :development
   depend_on "bones-rspec" , "~> 2.0.1", :development
-  depend_on "rspec"       , "~> 2.6.0", :development
-  depend_on "rake"        , "~> 0.9.2", :development
+  depend_on "rspec"       , "~> 2.8.0", :development
+  depend_on "rake"        , "~> 0.9.2.2", :development
 
   spec.opts << "--colour" << "--format documentation"
 }

data/lib/tyrant_manager/tyrant_instance.rb

@@ -49,7 +49,7 @@ class TyrantManager
     attr_reader :home_dir
 
     # the name of this instance
-    attr_reader :name 
+    attr_reader :name
 
     # the manager that is associated with this instance
     attr_accessor :manager
@@ -82,7 +82,7 @@ class TyrantManager
     # load the configuration
     #
     def configuration
-      unless @configuration then
+      unless defined? @configuration then
         eval(  IO.read( self.config_file ) )
         @configuration = Loquacious::Configuration.for( name )
       end
@@ -135,7 +135,7 @@ class TyrantManager
     # The full path to the database file.
     #
     def db_file( type = configuration.type )
-      unless @db_file then
+      unless defined? @db_file then
         @db_file = case type
                    when "memory-hash" then "*"
                    when "memory-tree" then "+"
@@ -164,20 +164,6 @@ class TyrantManager
       Dir.glob( "#{ulog_dir}/*.ulog" ).sort
     end
 
-    #
-    # The lua extension file
-    #
-    def lua_extension_file
-      @lua_extension_file ||= append_to_home_if_not_absolute( configuration.lua_extension_file )
-    end
-
-    #
-    # The replication timestamp file
-    #
-    def replication_timestamp_file
-      @replication_timestamp_file ||= append_to_home_if_not_absolute( configuration.replication_timestamp_file )
-    end
-
     #
     # Valid index styles as defined by Tokyo Cabinet
     #
@@ -197,7 +183,7 @@ class TyrantManager
     # into one big commandline item.  
     #
     def start_command
-      unless @start_command then
+      unless defined? @start_command then
         ##-- ttserver executable
         parts = [ manager.configuration.ttserver ]
 

data/lib/tyrant_manager/version.rb

@@ -7,7 +7,7 @@ class TyrantManager
   module Version
     MAJOR   = 1
     MINOR   = 7
-    BUILD   = 5
+    BUILD   = 6
 
     def to_a 
       [MAJOR, MINOR, BUILD]

data/lib/tyrant_manager.rb

@@ -160,7 +160,7 @@ class TyrantManager
   # setting the home directory.
   #
   def initialize( directory = TyrantManager.default_directory )
-    self.home_dir = File.expand_path( directory ) 
+    self.home_dir = File.expand_path( directory )
     if File.exist?( self.config_file ) then
       configuration # force a load
     else
@@ -176,14 +176,14 @@ class TyrantManager
   # The configuration file for the manager
   #
   def config_file
-    @config_file ||= File.join( home_dir, TyrantManager.config_file_basename ) 
+    @config_file ||= File.join( home_dir, TyrantManager.config_file_basename )
   end
 
   #
   # load the configuration
   #
   def configuration
-    unless @configuration 
+    unless defined? @configuration
       eval( IO.read( self.config_file ) )
       @configuration = Loquacious::Configuration.for("manager")
     end
@@ -201,7 +201,7 @@ class TyrantManager
   # Return the list of instances that the manager knows about
   #
   def instances
-    unless @instances then
+    unless defined? @instances then
       candidates = [ self.instances_path ]
       if configuration.instances then
         candidates = configuration.instances

data/spec/command_spec.rb

@@ -31,7 +31,7 @@ describe TyrantManager::Command do
 
   it "classes cannot be run without implementing 'run'" do
     j = Junk.new( nil )
-    j.respond_to?(:run).should == true
+    j.respond_to?(:run).should be == true
     lambda { j.run }.should raise_error( NotImplementedError, /The #run method must be implemented/)
   end
 end

data/spec/tyrant_instance_spec.rb

@@ -50,12 +50,12 @@ describe TyrantManager::TyrantInstance  do
   end
 
   it "#config_file" do
-    @instances['standalone'].config_file.should == File.join( @tyrant_manager_dir, "instances", "standalone", "config.rb" )
-    File.exist?( @instances['standalone'].config_file ).should == true
+    @instances['standalone'].config_file.should be == File.join( @tyrant_manager_dir, "instances", "standalone", "config.rb" )
+    File.exist?( @instances['standalone'].config_file ).should be == true
   end
 
   it "#configuration" do
-    @instances['standalone'].configuration.nil?.should == false
+    @instances['standalone'].configuration.nil?.should be == false
   end
 
   it "#pid_file" do
@@ -118,26 +118,26 @@ describe TyrantManager::TyrantInstance  do
     end
 
     it "#is_slave? when it is NOT a slave" do
-      @instances['standalone'].running?.should == true
-      @instances['standalone'].is_slave?.should == false
+      @instances['standalone'].running?.should be == true
+      @instances['standalone'].is_slave?.should be == false
     end
 
     it "#is_slave? when it IS a slave" do
-      @instances['slave_1'].running?.should == true
-      @instances['slave_1'].is_slave?.should == true
+      @instances['slave_1'].running?.should be == true
+      @instances['slave_1'].is_slave?.should be == true
     end
 
     it "#is_master_master? when it is NOT in a master_master relationship" do
-      @instances['slave_1'].running?.should == true
-      @instances['slave_1'].is_master_master?.should == false
+      @instances['slave_1'].running?.should be == true
+      @instances['slave_1'].is_master_master?.should be == false
     end
 
     it "#is_master_master? when it IS in a master_master relationship" do
-      @instances['master_master_1'].running?.should == true
-      @instances['master_master_1'].is_master_master?.should == true
+      @instances['master_master_1'].running?.should be== true
+      @instances['master_master_1'].is_master_master?.should be == true
 
-      @instances['master_master_2'].running?.should == true
-      @instances['master_master_2'].is_master_master?.should == true
+      @instances['master_master_2'].running?.should be == true
+      @instances['master_master_2'].is_master_master?.should be == true
     end
   end
 

data/spec/tyrant_manager_spec.rb

@@ -61,8 +61,8 @@ describe TyrantManager do
   end
 
   it "#config_file" do
-    @mgr.config_file.should == File.join( @tdir, "config.rb" )
-    File.exist?( @mgr.config_file ).should == true
+    @mgr.config_file.should be == File.join( @tdir, "config.rb" )
+    File.exist?( @mgr.config_file ).should be == true
   end
 
   it "#configuration" do
@@ -79,7 +79,7 @@ describe TyrantManager do
       TyrantManager::TyrantInstance.setup( idir )
     end
 
-    @mgr.instances.size.should == 3
+    @mgr.instances.size.should be == 3
     names = []
     @mgr.each_instance do |i|
       i.name.should =~ /test\d/
@@ -95,7 +95,7 @@ describe TyrantManager do
       TyrantManager::TyrantInstance.setup( idir )
     end
 
-    @mgr.instances.size.should == 3
+    @mgr.instances.size.should be == 3
     names = []
     @mgr.each_instance( %w[ test0 test2] ) do |i|
       i.name.should =~ /test\d/

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tyrantmanager
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 7
   prerelease: 
   segments: 
   - 1
   - 7
-  - 5
-  version: 1.7.5
+  - 6
+  version: 1.7.6
 platform: ruby
 authors: 
 - Jeremy Hinegardner
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-10 00:00:00 Z
+date: 2012-02-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: loquacious
@@ -25,12 +25,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 53
+        hash: 49
         segments: 
         - 1
-        - 8
+        - 9
         - 1
-        version: 1.8.1
+        version: 1.9.1
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -105,12 +105,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 25
+        hash: 29
         segments: 
         - 3
         - 7
-        - 1
-        version: 3.7.1
+        - 3
+        version: 3.7.3
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
@@ -137,12 +137,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 47
         segments: 
         - 2
-        - 6
+        - 8
         - 0
-        version: 2.6.0
+        version: 2.8.0
   type: :runtime
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
@@ -153,12 +153,13 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 63
+        hash: 11
         segments: 
         - 0
         - 9
         - 2
-        version: 0.9.2
+        - 2
+        version: 0.9.2.2
   type: :runtime
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
@@ -226,7 +227,7 @@ files:
 - spec/tyrant_instance_spec.rb
 - spec/tyrant_manager_spec.rb
 - spec/version_spec.rb
-homepage: http://www.copiousfreetime.org/projects/tyrant_manager
+homepage: https://github.com/copiousfreetime/tyrantmanager
 licenses: []
 
 post_install_message: 
@@ -256,7 +257,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: tyrantmanager
-rubygems_version: 1.8.7
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
 summary: A command line tool for managing Tokyo Tyrant instances.