tyrantmanager 1.6.0 → 1.7.1

data/HISTORY.rdoc

@@ -1,4 +1,17 @@
 = Changelog
+== Version 1.7.1 2011-05-15
+
+* fix mistaking the instance config.rb for the manager's config.rb [GH #11].
+* force an FFI dependency that for some reason does not resolve in rufus-tokyo [GH #8]
+* fix documentation of 'process-status' [GH #9]
+* switch to Bones for project management tasks
+* update dependencies to latest versions
+** rufus-tokyo 1.0.7
+** rspec 2.6.0
+** loquacious 1.7.1
+** logging 1.5.0
+** main 4.4.0
+
 == Version 1.6.0 2010-06-17
 
 * update to loquacious 1.6.x

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009, Jeremy Hinegardner
+Copyright (c) 2009-2011 Jeremy Hinegardner.  All Rights Reserved
 
 Permission to use, copy, modify, and/or distribute this software for any
 purpose with or without fee is hereby granted, provided that the above

data/README.rdoc

@@ -1,9 +1,9 @@
 == Tyrant Manager
 
-* Homepage[http://copiousfreetime.rubyforge.org/tyrantmanager]
-* {Rubyforge project}[http://rubyforge.org/projects/copiousfreetime/]
+* Homepage[http://copiousfreetime.org/projects/tyrantmanager]
 * email jeremy at copiousfreetime dot org
-* github[http://github.com/copiousfreetime/tyrantmanager]
+* {Github}[https://github.com/copiousfreetime/tyrantmanager]
+* {Bug Tracking}[https://github.com/copiousfreetime/tyrantmanager/issue]
 * git clone git://github.com/copiousfreetime/tyrantmanager.git
 
 == INSTALLATION
@@ -12,7 +12,8 @@
 
 == SYNOPSIS
 
-  tyrantmanager (setup|create-instance|start|stop|status|stats|list) [options]+
+  tyrantmanager
+  (setup|create-instance|start|stop|process-status|replication-status|stats|list) [options]+
 
 == DESCRIPTION
 
@@ -37,8 +38,18 @@ Once the manager home is setup, all other commands need to know about it.
 This can be achieved in 3 ways.
 
 * use the --home option on all commands
-* set the TYRANT_MANAGER_HOME environment variable
 * execute the commands when the current working directory is the tyrant home. 
+* set the TYRANT_MANAGER_HOME environment variable
+
+This is also the attempt order when looking for the manager home.  The process
+is:
+
+1. Check if --home is used, and that it is a valid tyrantmanager home. If that
+   is the case then use it.
+2. If --home is not used, then check if the current working directory has a
+   valid 'config.rb' file that is also a top level manager config.  If it is
+   then use that as the tyrant manager home.
+3. If all else fails, use the TYRANT_MAMAGER_HOME environment variable.
 
 === Creating a new tyrant instance
 
@@ -177,7 +188,7 @@ the ttserver command line that was used is output.
 
 As you can see the commandline used to start the tyrant server is output.
 
-    jeremy@playground:/tmp/tyrant % tyrantmanager status
+    jeremy@playground:/tmp/tyrant % tyrantmanager process-status
     00:52:17  INFO : bar is running as pid 28658
     00:52:17  INFO : baz is running as pid 28670
     00:52:17  INFO : foo is running as pid 28682
@@ -194,7 +205,7 @@ As you can see the commandline used to start the tyrant server is output.
 
 And see that they are all done
 
-    jeremy@playground:/tmp/tyrant % tyrantmanager status
+    jeremy@playground:/tmp/tyrant % tyrantmanager process-status
     00:53:15  INFO : bar is not running, or its pid file is gone
     00:53:15  INFO : baz is not running, or its pid file is gone
     00:53:15  INFO : foo is not running, or its pid file is gone
@@ -209,7 +220,7 @@ And see that they are all done
 
 Foo and baz are started, bar is still stopped
 
-    jeremy@playground:/tmp/tyrant % tyrantmanager status
+    jeremy@playground:/tmp/tyrant % tyrantmanager process-status
     00:54:38  INFO : bar is not running, or its pid file is gone
     00:54:38  INFO : baz is running as pid 28708
     00:54:38  INFO : foo is running as pid 28720
@@ -222,7 +233,7 @@ Foo and baz are started, bar is still stopped
 
 And baz is still running
 
-    jeremy@playground:/tmp/tyrant % tyrantmanager status
+    jeremy@playground:/tmp/tyrant % tyrantmanager process-status
     00:55:51  INFO : bar is not running, or its pid file is gone
     00:55:51  INFO : baz is running as pid 28708
     00:55:51  INFO : foo is not running, or its pid file is gone
@@ -261,7 +272,7 @@ You can also look at the server statistics of each running instance
 
 == LICENSE
 
-Copyright (c) 2009, Jeremy Hinegardner
+Copyright (c) 2009-2011, Jeremy Hinegardner. All rights reserved
 
 Permission to use, copy, modify, and/or distribute this software for any
 purpose with or without fee is hereby granted, provided that the above

data/Rakefile

@@ -0,0 +1,53 @@
+#--
+# Copyright (c) 2009-2011 Jeremy Hinegardner
+# All rights reserved.  See LICENSE and/or COPYING for details.
+#++
+
+begin
+  require 'bones'
+rescue LoadError
+  abort '### Please install the "bones" gem ###'
+end
+
+task :default => 'spec:run'
+task 'gem:release' => 'spec:run'
+
+$:.unshift( "lib" )
+require 'tyrant_manager/version'
+
+Bones {
+  name    "tyrantmanager"
+  author  "Jeremy Hinegardner"
+  email   "jeremy@copiousfreetime.org"
+  url     "http://www.copiousfreetime.org/projects/tyrant_manager"
+  version TyrantManager::VERSION
+
+  ruby_opts     %w[ -W0 -rubygems ]
+  readme_file   "README.rdoc"
+  ignore_file   ".gitignore"
+  history_file  "HISTORY.rdoc"
+
+  rdoc.include << "README.rdoc" << "HISTORY.rdoc" << "LICENSE"
+
+  summary 'A command line tool for managing Tokyo Tyrant instances.'
+  description <<_
+A command line tool for managing Tokyo Tyrant instances.  It allows for the
+creation, starting, stopping, listing, stating of many tokyo tyrant instances
+all on the same machine.  The commands can be applied to a single or multiple
+instances.
+_
+
+  depend_on "loquacious"  ,"~> 1.7.1"
+  depend_on "rufus-tokyo" ,"~> 1.0.7"
+  depend_on "logging"     ,"~> 1.5.0"
+  depend_on "main"        ,"~> 4.4.0"
+  depend_on "ffi"         ,"~> 1.0.7" #unsure why this doesn't get resolved with rufus-tokyo
+
+
+  depend_on "bones"       , "~> 3.6.5", :development
+  depend_on "bones-extras", "~> 1.3.0", :development
+  depend_on "rspec"       , "~> 2.6.0", :development
+
+  spec.opts << "--colour" << "--format documentation"
+}
+

data/TODO.taskpaper

@@ -0,0 +1,11 @@
+Tyrant Manager:
+
+    Startup Script:
+        - startup script generation -- simple shell, executes the tyrant-manager
+        - main command line -- all the commands, and they take an optional instance
+          or all -- no default
+        - remove -- not yet
+    Configuration:
+        - Fix cascading config so it is not a work around for Loquacious 
+          nattering on about undefined values.  A proper merged config
+          would be better.

data/bin/tyrantmanager

@@ -1,11 +1,10 @@
 #!/usr/bin/env ruby
 
 #--
-# Copyright (c) 2009 
+# Copyright (c) 2009-2011 Jeremy Hinegardner
 # All rights reserved.  See LICENSE and/or COPYING for details.
 #++
 
 $:.unshift File.expand_path(File.join(File.dirname(__FILE__),"..","lib"))
 require 'tyrant_manager'
-#::TyrantManager::Cli.new( ARGV, ENV ).run
 ::TyrantManager::Cli.build( ARGV, ENV ).new.run

data/lib/tyrant_manager/cli.rb

@@ -1,11 +1,14 @@
-#gem 'fattr', '~> 1.1.0'
-#gem 'main', "~> 2.9.3"
+#--
+# Copyright (c) 2009-2011 Jeremy Hinegardner
+# All rights reserved.  See LICENSE and/or COPYING for details.
+#++
+
 require 'main'
 require 'tyrant_manager'
 
 class TyrantManager
   Cli = Main.create {
-    author "Copyright 2009 (c) Jeremy Hinegardner"
+    author "Copyright (c) 2009-2011 Jeremy Hinegardner. All rights reserved"
     version ::TyrantManager::VERSION
 
     description <<-txt

data/lib/tyrant_manager/command.rb

@@ -1,3 +1,8 @@
+#--
+# Copyright (c) 2009-2011 Jeremy Hinegardner
+# All rights reserved.  See LICENSE and/or COPYING for details.
+#++
+
 require 'tyrant_manager'
 class TyrantManager
   #

data/lib/tyrant_manager/commands/archive_ulogs.rb

@@ -1,3 +1,8 @@
+#--
+# Copyright (c) 2009-2011 Jeremy Hinegardner
+# All rights reserved.  See LICENSE and/or COPYING for details.
+#++
+
 require 'tyrant_manager/command'
 require 'socket'
 

data/lib/tyrant_manager/commands/create_instance.rb

@@ -1,3 +1,8 @@
+#--
+# Copyright (c) 2009-2011 Jeremy Hinegardner
+# All rights reserved.  See LICENSE and/or COPYING for details.
+#++
+
 require 'pathname'
 require 'tyrant_manager/command'
 class TyrantManager

data/lib/tyrant_manager/commands/list.rb

@@ -1,3 +1,8 @@
+#--
+# Copyright (c) 2009-2011 Jeremy Hinegardner
+# All rights reserved.  See LICENSE and/or COPYING for details.
+#++
+
 require 'pathname'
 require 'tyrant_manager/command'
 class TyrantManager

data/lib/tyrant_manager/commands/replication_status.rb

@@ -1,3 +1,8 @@
+#--
+# Copyright (c) 2009-2011 Jeremy Hinegardner
+# All rights reserved.  See LICENSE and/or COPYING for details.
+#++
+
 require 'tyrant_manager/command'
 require 'socket'
 

data/lib/tyrant_manager/commands/start.rb

@@ -1,3 +1,8 @@
+#--
+# Copyright (c) 2009-2011 Jeremy Hinegardner
+# All rights reserved.  See LICENSE and/or COPYING for details.
+#++
+
 require 'tyrant_manager/command'
 class TyrantManager
   module Commands

data/lib/tyrant_manager/commands/stats.rb

@@ -1,3 +1,8 @@
+#--
+# Copyright (c) 2009-2011 Jeremy Hinegardner
+# All rights reserved.  See LICENSE and/or COPYING for details.
+#++
+
 require 'tyrant_manager/command'
 class TyrantManager
   module Commands

data/lib/tyrant_manager/commands/status.rb

@@ -1,3 +1,8 @@
+#--
+# Copyright (c) 2009-2011 Jeremy Hinegardner
+# All rights reserved.  See LICENSE and/or COPYING for details.
+#++
+
 require 'tyrant_manager/command'
 class TyrantManager
   module Commands

data/lib/tyrant_manager/commands/stop.rb

@@ -1,3 +1,8 @@
+#--
+# Copyright (c) 2009-2011 Jeremy Hinegardner
+# All rights reserved.  See LICENSE and/or COPYING for details.
+#++
+
 require 'tyrant_manager/command'
 class TyrantManager
   module Commands

data/lib/tyrant_manager/log.rb

@@ -1,3 +1,8 @@
+#--
+# Copyright (c) 2009-2011 Jeremy Hinegardner
+# All rights reserved.  See LICENSE and/or COPYING for details.
+#++
+
 require 'logging'
 require 'tyrant_manager'
 

data/lib/tyrant_manager/paths.rb

@@ -1,3 +1,8 @@
+#--
+# Copyright (c) 2009-2011 Jeremy Hinegardner
+# All rights reserved.  See LICENSE and/or COPYING for details.
+#++
+
 require 'rbconfig'
 class TyrantManager
   module Paths

data/lib/tyrant_manager/runner.rb

@@ -1,3 +1,8 @@
+#--
+# Copyright (c) 2009-2011 Jeremy Hinegardner
+# All rights reserved.  See LICENSE and/or COPYING for details.
+#++
+
 require 'tyrant_manager/command'
 
 class TyrantManager

data/lib/tyrant_manager/tyrant_instance.rb

@@ -1,3 +1,8 @@
+#--
+# Copyright (c) 2009-2011 Jeremy Hinegardner
+# All rights reserved.  See LICENSE and/or COPYING for details.
+#++
+
 require 'tyrant_manager'
 require 'rufus/tokyo/tyrant'
 require 'erb'

data/lib/tyrant_manager/util.rb

@@ -1,3 +1,8 @@
+#--
+# Copyright (c) 2009-2011 Jeremy Hinegardner
+# All rights reserved.  See LICENSE and/or COPYING for details.
+#++
+
 class TyrantManager
   module Util
     def ip_of( hostname )

data/lib/tyrant_manager/version.rb

@@ -1,13 +1,13 @@
 #--
-# Copyright (c) 2009 Jeremy Hinegardner
+# Copyright (c) 2009-2011 Jeremy Hinegardner
 # All rights reserved.  See LICENSE and/or COPYING for details
 #++
 
 class TyrantManager
   module Version
     MAJOR   = 1
-    MINOR   = 6
-    BUILD   = 0
+    MINOR   = 7
+    BUILD   = 1
 
     def to_a 
       [MAJOR, MINOR, BUILD]

data/lib/tyrant_manager.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2009 Jeremy Hinegardner
+# Copyright (c) 2009-2011 Jeremy Hinegardner
 # All rights reserved.  See LICENSE and/or COPYING for details.
 #++
 
@@ -31,13 +31,27 @@ class TyrantManager
       "tyrant"
     end
 
+    MAGIC_LINE = 'Loquacious::Configuration.for( "manager" ) do'
+
     #
     # is the given directory a tyrant root directory.  A tyrant root has a
-    # +config_file_basename+ file in the top level
+    # +config_file_basename+ file in the top level.  And that
+    # +config_file_basename+ file has the following line in it.
+    #
+    #   Loquacious::Configuration.for( "manager" ) do
+    #
+    # Consider this a 'magic line' in the config file.  If this line is in the
+    # config file then it is considered the top level tyrant root config file.
+    # This is done by line detection instead of evaluation since the
+    # configuration is not evaluated until later.
     #
     def is_tyrant_root?( dir )
       cfg = File.join( dir, config_file_basename )
-      return true if File.directory?( dir ) and File.exist?( cfg )
+      if File.directory?( dir ) and File.exist?( cfg ) then
+        IO.readlines( cfg ).each do |line|
+          return true if line.index( MAGIC_LINE )
+        end
+      end
       return false
     end
 
@@ -92,7 +106,7 @@ class TyrantManager
         dd = defaults.shift
         break if dd or defaults.empty?
       end
-      raise Error, "No default_directory found" unless dd
+      raise Error, "No default Tyrant Manager home directory found" unless dd
       return dd
     end
 
@@ -150,7 +164,7 @@ class TyrantManager
     if File.exist?( self.config_file ) then
       configuration # force a load
     else
-      raise Error, "#{home_dir} is not a valid archive. #{self.config_file} does not exist"
+      raise Error, "#{home_dir} is not a valid TyrantManager home. #{self.config_file} does not exist"
     end
   end
 

data/lib/tyrantmanager.rb

@@ -1,2 +1,7 @@
+#--
+# Copyright (c) 2009-2011 Jeremy Hinegardner
+# All rights reserved.  See LICENSE and/or COPYING for details.
+#++
+
 require 'tyrant_manager'
 

data/spec/spec_helper.rb

@@ -1,5 +1,4 @@
-require 'rubygems'
-require 'spec'
+require 'rspec'
 require 'logging'
 
 $:.unshift File.expand_path( File.join( File.dirname( __FILE__ ),"..","lib"))
@@ -7,7 +6,7 @@ $:.unshift File.expand_path( File.join( File.dirname( __FILE__ ),"..","lib"))
 
 Logging::Logger['TyrantManager'].level = :all
 
-module Spec
+module RSpec
   module Log
     def self.io
       @io ||= StringIO.new
@@ -43,16 +42,16 @@ module Spec
   end
 end
 
-Spec::Runner.configure do |config|
-  config.include Spec::Helpers
+RSpec.configure do |config|
+  config.include RSpec::Helpers
 
   config.before do
-    Spec::Log.io.rewind
-    Spec::Log.io.truncate( 0 )
+    RSpec::Log.io.rewind
+    RSpec::Log.io.truncate( 0 )
   end
 
   config.after do
-    Spec::Log.io.rewind
-    Spec::Log.io.truncate( 0 )
+    RSpec::Log.io.rewind
+    RSpec::Log.io.truncate( 0 )
   end
 end

data/spec/tyrant_instance_spec.rb

@@ -55,7 +55,7 @@ describe TyrantManager::TyrantInstance  do
   end
 
   it "#configuration" do
-    @instances['standalone'].configuration.should_not == nil
+    @instances['standalone'].configuration.nil?.should == false
   end
 
   it "#pid_file" do

data/spec/tyrant_manager_spec.rb

@@ -8,6 +8,7 @@ describe TyrantManager do
     TyrantManager::Log.silent {
       @mgr  = TyrantManager.setup( @tdir )
     }
+    ENV.delete( 'TYRANT_MANAGER_HOME' )
     #TyrantManager::Log.level = :debug
   end
 
@@ -27,6 +28,27 @@ describe TyrantManager do
       ENV['TYRANT_MANAGER_HOME'] = @tdir
       TyrantManager.default_directory.should == @tdir
     end
+
+    context "When the current directory is an instance's home directory" do
+      before do
+        ENV['TYRANT_MANAGER_HOME'] = @tdir
+        idir = @mgr.instances_path( "test" )
+        @test_instance = TyrantManager::TyrantInstance.setup( idir )
+      end
+
+      it "falls back to TYRANT_MANAGER_HOME if the current directory is not a valid tyrant manager home" do
+        Dir.chdir( @test_instance.home_dir ) do |d|
+          TyrantManager.default_directory.should == @tdir
+        end
+      end
+
+      it "raises an error if no default can be found" do
+        ENV.delete('TYRANT_MANAGER_HOME')
+        Dir.chdir( @test_instance.home_dir ) do |d|
+          lambda { TyrantManager.default_directory }.should raise_error( TyrantManager::Error, "No default Tyrant Manager home directory found" )
+        end
+      end
+    end
   end
 
   it "initializes with an existing directory" do
@@ -35,7 +57,7 @@ describe TyrantManager do
   end
 
   it "raises an error if attempting to initialize from a non-existent tyrnat home" do
-    lambda { TyrantManager.new( "/tmp" ) }.should raise_error( TyrantManager::Error, /\/tmp is not a valid archive/ )
+    lambda { TyrantManager.new( "/tmp" ) }.should raise_error( TyrantManager::Error, /\/tmp is not a valid TyrantManager home/ )
   end
 
   it "#config_file" do
@@ -44,7 +66,7 @@ describe TyrantManager do
   end
 
   it "#configuration" do
-    @mgr.configuration.should_not == nil
+    @mgr.configuration.nil?.should == false
   end
 
   it "has the location of the ttserver command" do

metadata

@@ -1,111 +1,143 @@
 --- !ruby/object:Gem::Specification 
 name: tyrantmanager
 version: !ruby/object:Gem::Version 
-  version: 1.6.0
+  prerelease: 
+  version: 1.7.1
 platform: ruby
-authors: 
-- Jeremy Hinegardner
+authors: []
+
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-06-17 00:00:00 -06:00
+date: 2011-05-15 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: loquacious
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.6.4
-    version: 
+        version: 1.7.1
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rufus-tokyo
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.0.1
-    version: 
+        version: 1.0.7
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: logging
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.4.3
-    version: 
+        version: 1.5.0
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: main
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 4.4.0
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: ffi
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 4.2.0
-    version: 
+        version: 1.0.7
+  type: :runtime
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: configuration
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  name: bones
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.1.0
-    version: 
+        version: 3.6.5
+  type: :runtime
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: rake
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  name: bones-extras
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.8.3
-    version: 
-description: |-
+        version: 1.3.0
+  type: :runtime
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 2.6.0
+  type: :runtime
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: bones
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 3.6.5
+  type: :development
+  version_requirements: *id009
+description: |
   A command line tool for managing Tokyo Tyrant instances.  It allows for the
   creation, starting, stopping, listing, stating of many tokyo tyrant instances
   all on the same machine.  The commands can be applied to a single or multiple
   instances.
+
 email: jeremy@copiousfreetime.org
 executables: 
 - tyrantmanager
 extensions: []
 
 extra_rdoc_files: 
-- README.rdoc
 - HISTORY.rdoc
 - LICENSE
-- lib/tyrant_manager/cli.rb
-- lib/tyrant_manager/command.rb
-- lib/tyrant_manager/commands/archive_ulogs.rb
-- lib/tyrant_manager/commands/create_instance.rb
-- lib/tyrant_manager/commands/list.rb
-- lib/tyrant_manager/commands/replication_status.rb
-- lib/tyrant_manager/commands/start.rb
-- lib/tyrant_manager/commands/stats.rb
-- lib/tyrant_manager/commands/status.rb
-- lib/tyrant_manager/commands/stop.rb
-- lib/tyrant_manager/log.rb
-- lib/tyrant_manager/paths.rb
-- lib/tyrant_manager/runner.rb
-- lib/tyrant_manager/tyrant_instance.rb
-- lib/tyrant_manager/util.rb
-- lib/tyrant_manager/version.rb
-- lib/tyrant_manager.rb
-- lib/tyrantmanager.rb
+- README.rdoc
+- bin/tyrantmanager
 files: 
+- HISTORY.rdoc
+- LICENSE
+- README.rdoc
+- Rakefile
+- TODO.taskpaper
 - bin/tyrantmanager
+- data/config.rb
+- data/default_instance_config.rb
+- lib/tyrant_manager.rb
 - lib/tyrant_manager/cli.rb
 - lib/tyrant_manager/command.rb
 - lib/tyrant_manager/commands/archive_ulogs.rb
@@ -122,7 +154,6 @@ files:
 - lib/tyrant_manager/tyrant_instance.rb
 - lib/tyrant_manager/util.rb
 - lib/tyrant_manager/version.rb
-- lib/tyrant_manager.rb
 - lib/tyrantmanager.rb
 - spec/command_spec.rb
 - spec/paths_spec.rb
@@ -130,22 +161,8 @@ files:
 - spec/tyrant_instance_spec.rb
 - spec/tyrant_manager_spec.rb
 - spec/version_spec.rb
-- data/config.rb
-- data/default_instance_config.rb
-- README.rdoc
-- HISTORY.rdoc
-- LICENSE
-- tasks/announce.rake
-- tasks/distribution.rake
-- tasks/documentation.rake
-- tasks/gemcutter.rake
-- tasks/rspec.rake
-- tasks/rubyforge.rake
-- tasks/config.rb
-- tasks/utils.rb
-- gemspec.rb
 has_rdoc: true
-homepage: http://copiousfreetime.rubyforge.org/tyrantmanager
+homepage: http://www.copiousfreetime.org/projects/tyrant_manager
 licenses: []
 
 post_install_message: 
@@ -155,23 +172,23 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
       version: "0"
-  version: 
 requirements: []
 
-rubyforge_project: copiousfreetime
-rubygems_version: 1.3.5
+rubyforge_project: tyrantmanager
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
-summary: A command line tool for managing Tokyo Tyrant instances
+summary: A command line tool for managing Tokyo Tyrant instances.
 test_files: []
 

data/gemspec.rb

@@ -1,53 +0,0 @@
-require 'rubygems'
-require 'tyrant_manager/version'
-require 'tasks/config'
-
-TyrantManager::GEM_SPEC = Gem::Specification.new do |spec|
-  proj = Configuration.for('project')
-  spec.name         = proj.name
-  spec.version      = TyrantManager::VERSION
-  
-  spec.author       = proj.author
-  spec.email        = proj.email
-  spec.homepage     = proj.homepage
-  spec.summary      = proj.summary
-  spec.description  = proj.description
-  spec.platform     = Gem::Platform::RUBY
-
-  
-  pkg = Configuration.for('packaging')
-  spec.files        = pkg.files.all
-  spec.executables  = pkg.files.bin.collect { |b| File.basename(b) }
-
-  # add dependencies here
-  spec.add_dependency( "loquacious", "~> 1.6.4")
-  spec.add_dependency( "rufus-tokyo", "~> 1.0.1")
-  spec.add_dependency( "logging", "~> 1.4.3" )
-  spec.add_dependency( "main", "~> 4.2.0" )
-
-  # development dependencies
-  spec.add_development_dependency("configuration", "~> 1.1.0")
-  spec.add_development_dependency( "rake", "~> 0.8.3")
-
-  if ext_conf = Configuration.for_if_exist?("extension") then
-    spec.extensions << ext_conf.configs
-    spec.extensions.flatten!
-  end
-  
-  if rdoc = Configuration.for_if_exist?('rdoc') then
-    spec.has_rdoc         = true
-    spec.extra_rdoc_files = pkg.files.rdoc
-    spec.rdoc_options     = rdoc.options + [ "--main" , rdoc.main_page ]
-  else
-    spec.has_rdoc         = false
-  end 
-
-  if test = Configuration.for_if_exist?('testing') then
-    spec.test_files       = test.files
-  end 
-
-  if rf = Configuration.for_if_exist?('rubyforge') then
-    spec.rubyforge_project  = rf.project
-  end 
-
-end

data/tasks/announce.rake

@@ -1,43 +0,0 @@
-require 'tasks/config'
-#-------------------------------------------------------------------------------
-# announcement methods
-#-------------------------------------------------------------------------------
-
-proj_config = Configuration.for('project')
-namespace :announce do
-  desc "create email for ruby-talk"
-  task :email do
-    info = Utils.announcement
-
-    File.open("email.txt", "w") do |mail|
-      mail.puts "From: #{proj_config.author} <#{proj_config.email}>"
-      mail.puts "To: ruby-talk@ruby-lang.org"
-      mail.puts "Date: #{Time.now.rfc2822}"
-      mail.puts "Subject: [ANN] #{info[:subject]}"
-      mail.puts
-      mail.puts info[:title]
-      mail.puts 
-      mail.puts "{{ Release notes for Version #{TyrantManager::VERSION} }}"
-      mail.puts 
-      mail.puts info[:release_notes]
-      mail.puts
-      mail.puts "  #{info[:urls]}"
-      mail.puts
-      mail.puts "=== Installation"
-      mail.puts
-      mail.puts "  gem install #{TyrantManager::GEM_SPEC.name}"
-      mail.puts
-      mail.puts "=== Description"
-      mail.puts
-      mail.puts info[:description]
-      mail.puts
-    end 
-    puts "Created the following as email.txt:"
-    puts "-" * 72
-    puts File.read("email.txt")
-    puts "-" * 72
-  end 
-
-  CLOBBER << "email.txt"
-end
-

data/tasks/config.rb

@@ -1,99 +0,0 @@
-require 'configuration'
-
-require 'rake'
-require 'tasks/utils'
-
-#-----------------------------------------------------------------------
-# General project configuration
-#-----------------------------------------------------------------------
-Configuration.for('project') {
-  name          "tyrantmanager"
-  version       TyrantManager::VERSION
-  author        "Jeremy Hinegardner"
-  email         "jeremy@copiousfreetime.org"
-  homepage      "http://copiousfreetime.rubyforge.org/tyrantmanager/"
-  description   Utils.section_of("README.rdoc", "description")
-  summary       description.split(".").first
-  history       "HISTORY.rdoc"
-  license       FileList["LICENSE"]
-  readme        "README.rdoc"
-}
-
-#-----------------------------------------------------------------------
-# Packaging 
-#-----------------------------------------------------------------------
-Configuration.for('packaging') {
-  # files in the project 
-  proj_conf = Configuration.for('project')
-  files {
-    bin       FileList["bin/*"]
-    ext       FileList["ext/*.{c,h,rb}"]
-    lib       FileList["lib/**/*.rb"]
-    test      FileList["spec/**/*.rb", "test/**/*.rb"]
-    data      FileList["data/**/*"]
-    tasks     FileList["tasks/**/*.r{ake,b}"]
-    rdoc      FileList[proj_conf.readme, proj_conf.history,
-                       proj_conf.license] + lib
-    all       bin + ext + lib + test + data + rdoc + tasks 
-  }
-
-  # ways to package the results
-  formats {
-    tgz true
-    zip true
-    rubygem Configuration::Table.has_key?('rubygem')
-  }
-}
-
-#-----------------------------------------------------------------------
-# Gem packaging
-#-----------------------------------------------------------------------
-Configuration.for("rubygem") {
-  spec "gemspec.rb"
-  Configuration.for('packaging').files.all << spec
-}
-
-#-----------------------------------------------------------------------
-# Testing
-#   - change mode to 'testunit' to use unit testing
-#-----------------------------------------------------------------------
-Configuration.for('test') {
-  mode      "spec"
-  files     Configuration.for("packaging").files.test
-  options   %w[ --format specdoc --color ]
-  ruby_opts %w[ ]
-}
-
-#-----------------------------------------------------------------------
-# Rcov 
-#-----------------------------------------------------------------------
-Configuration.for('rcov') {
-  output_dir  "coverage"
-  libs        %w[ lib ]
-  rcov_opts   %w[ --html ]
-  ruby_opts   %w[ ]
-  test_files  Configuration.for('packaging').files.test
-}
-
-#-----------------------------------------------------------------------
-# Rdoc 
-#-----------------------------------------------------------------------
-Configuration.for('rdoc') {
-  files       Configuration.for('packaging').files.rdoc
-  main_page   files.first
-  title       Configuration.for('project').name
-  options     %w[ ]
-  output_dir  "doc"
-}
-
-#-----------------------------------------------------------------------
-# Rubyforge 
-#-----------------------------------------------------------------------
-Configuration.for('rubyforge') {
-  project       "copiousfreetime"
-  user          "jjh"
-  host          "rubyforge.org"
-  rdoc_location "#{user}@#{host}:/var/www/gforge-projects/#{project}/tyrantmanager/"
-}
-
-

data/tasks/distribution.rake

@@ -1,45 +0,0 @@
-require 'tasks/config'
-
-#-------------------------------------------------------------------------------
-# Distribution and Packaging
-#-------------------------------------------------------------------------------
-if pkg_config = Configuration.for_if_exist?("packaging") then
-
-  require 'gemspec'
-  require 'rake/gempackagetask'
-  require 'rake/contrib/sshpublisher'
-
-  namespace :dist do
-
-    Rake::GemPackageTask.new(TyrantManager::GEM_SPEC) do |pkg|
-      pkg.need_tar = pkg_config.formats.tgz
-      pkg.need_zip = pkg_config.formats.zip
-    end
-
-    desc "Install as a gem"
-    task :install => [:clobber, :package] do
-      sh "sudo gem install pkg/#{TyrantManager::GEM_SPEC.full_name}.gem --no-rdoc --no-ri --local"
-    end
-
-    desc "Uninstall gem"
-    task :uninstall do 
-      sh "sudo gem uninstall -x #{TyrantManager::GEM_SPEC.name}"
-    end
-
-    desc "dump gemspec"
-    task :gemspec do
-      puts TyrantManager::GEM_SPEC.to_ruby
-    end
-
-    desc "reinstall gem"
-    task :reinstall => [:uninstall, :repackage, :install]
-
-    desc "distribute copiously"
-    task :copious => [:clean, :package ] do
-      Rake::SshFilePublisher.new('jeremy@copiousfreetime.org',
-                                 '/var/www/vhosts/www.copiousfreetime.org/htdocs/gems/gems',
-                                 'pkg', "#{TyrantManager::GEM_SPEC.full_name}.gem").upload
-      sh "ssh jeremy@copiousfreetime.org rake -f /var/www/vhosts/www.copiousfreetime.org/htdocs/gems/Rakefile"
-    end 
-  end
-end

data/tasks/documentation.rake

@@ -1,32 +0,0 @@
-require 'tasks/config'
-
-#-----------------------------------------------------------------------
-# Documentation
-#-----------------------------------------------------------------------
-
-if rdoc_config = Configuration.for_if_exist?('rdoc') then
-
-  namespace :doc do
-
-    require 'rdoc'
-    require 'rake/rdoctask'
-
-    # generating documentation locally
-    Rake::RDocTask.new do |rdoc|
-      rdoc.rdoc_dir   = rdoc_config.output_dir
-      rdoc.options    = rdoc_config.options
-      rdoc.rdoc_files = rdoc_config.files
-      rdoc.title      = rdoc_config.title
-      rdoc.main       = rdoc_config.main_page
-    end 
-
-    if rubyforge_config = Configuration.for_if_exist?('rubyforge') then
-      desc "Deploy the RDoc documentation to #{rubyforge_config.rdoc_location}"
-      task :deploy => :rerdoc do
-        sh "rsync -zav --delete #{rdoc_config.output_dir}/ #{rubyforge_config.rdoc_location}"
-      end 
-    end 
-
-  end 
-end
-

data/tasks/gemcutter.rake

@@ -1,15 +0,0 @@
-require 'tasks/config'
-
-#-----------------------------------------------------------------------
-# Gemcutter additions to the task library
-#-----------------------------------------------------------------------
-namespace :dist do
-  desc "Release files to gemcutter"
-
-  task :push => :gem do
-    gem_file = File.expand_path( File.join( "pkg", "#{TyrantManager::GEM_SPEC.full_name}.gem" ) )
-    %x[ gem push -V #{gem_file} ].each do |line|
-      puts line
-    end
-  end
-end

data/tasks/rspec.rake

@@ -1,29 +0,0 @@
-
-require 'tasks/config'
-
-#--------------------------------------------------------------------------------
-# configuration for running rspec.  This shows up as the test:default task
-#--------------------------------------------------------------------------------
-if spec_config = Configuration.for_if_exist?("test") then
-  if spec_config.mode == "spec" then
-    namespace :test do
-
-      task :default => :spec
-
-      require 'spec/rake/spectask'
-      Spec::Rake::SpecTask.new do |r| 
-        r.ruby_opts   = spec_config.ruby_opts
-        r.libs        = [ TyrantManager.lib_path, 
-                          TyrantManager.install_dir ]
-        r.spec_files  = spec_config.files 
-        r.spec_opts   = spec_config.options
-
-        if rcov_config = Configuration.for_if_exist?('rcov') then
-          r.rcov      = true
-          r.rcov_dir  = rcov_config.output_dir
-          r.rcov_opts = rcov_config.rcov_opts
-        end
-      end
-    end
-  end
-end

data/tasks/rubyforge.rake

@@ -1,51 +0,0 @@
-require 'tasks/config'    
-
-#-----------------------------------------------------------------------
-# Rubyforge additions to the task library
-#-----------------------------------------------------------------------
-if rf_conf = Configuration.for_if_exist?("rubyforge") then
-
-  abort("rubyforge gem not installed 'gem install rubyforge'") unless Utils.try_require('rubyforge')
-  
-  proj_conf = Configuration.for('project')
-
-  namespace :dist do
-    desc "Release files to rubyforge"
-    task :rubyforge => [:clean, :package] do
-
-      rubyforge = RubyForge.new
-
-      config = {}
-      config["release_notes"]     = proj_conf.description
-      config["release_changes"]   = Utils.release_notes_from(proj_conf.history)[TyrantManager::VERSION]
-      config["Prefomatted"]       = true
-
-      rubyforge.configure
-
-      # make sure this release doesn't already exist
-      releases = rubyforge.autoconfig['release_ids']
-      if releases.has_key?(TyrantManager::GEM_SPEC.name) and releases[TyrantManager::GEM_SPEC.name][TyrantManager::VERSION] then
-        abort("Release #{TyrantManager::VERSION} already exists! Unable to release.")
-      end
-
-      puts "Uploading to rubyforge..."
-      files = FileList[File.join("pkg","#{TyrantManager::GEM_SPEC.name}-#{TyrantManager::VERSION}*.*")].to_a
-      rubyforge.login
-      rubyforge.add_release(TyrantManager::GEM_SPEC.rubyforge_project, TyrantManager::GEM_SPEC.name, TyrantManager::VERSION, *files)
-      puts "done."
-    end
-  end
-
-  namespace :announce do
-    desc "Post news of #{proj_conf.name} to #{rf_conf.project} on rubyforge"
-    task :rubyforge do
-      info = Utils.announcement
-      rubyforge = RubyForge.new
-      rubyforge.configure
-      rubyforge.login
-      rubyforge.post_news(rf_conf.project, info[:subject], "#{info[:title]}\n\n#{info[:urls]}\n\n#{info[:release_notes]}")
-      puts "Posted to rubyforge"
-    end
-
-  end
-end

data/tasks/utils.rb

@@ -1,80 +0,0 @@
-require 'tyrant_manager/version'
-
-#-------------------------------------------------------------------------------
-# Additions to the Configuration class that are useful
-#-------------------------------------------------------------------------------
-class Configuration
-  class << self
-    def exist?( name )
-      Configuration::Table.has_key?( name )
-    end
-
-    def for_if_exist?( name )
-      if self.exist?( name ) then
-        self.for( name )
-      end
-    end
-  end
-end
-
-#-------------------------------------------------------------------------------
-# some useful utilitiy methods for the tasks
-#-------------------------------------------------------------------------------
-module Utils
-  class << self
-
-    # Try to load the given _library_ using the built-in require, but do not
-    # raise a LoadError if unsuccessful. Returns +true+ if the _library_ was
-    # successfully loaded; returns +false+ otherwise.
-    #
-    def try_require( lib ) 
-      require lib
-      true 
-    rescue LoadError 
-      false 
-    end 
-
-    # partition an rdoc file into sections, and return the text of the section
-    # given.  
-    def section_of(file, section_name) 
-      File.read(file).split(/^(?==)/).each do |section|
-        lines = section.split("\n")
-        return lines[1..-1].join("\n").strip if lines.first =~ /#{section_name}/i
-      end
-      nil
-    end
-
-    # Get an array of all the changes in the application for a particular
-    # release.  This is done by looking in the history file and grabbing the
-    # information for the most recent release.  The history file is assumed to
-    # be in RDoc format and version release are 2nd tier sections separated by
-    # '== Version X.Y.Z'
-    #
-    # returns:: A hash of notes keyed by version number
-    #
-    def release_notes_from(history_file)
-      releases = {}
-      File.read(history_file).split(/^(?==)/).each do |section|
-        lines = section.split("\n")
-        md = %r{Version ((\w+\.)+\w+)}.match(lines.first)
-        next unless md
-        releases[md[1]] = lines[1..-1].join("\n").strip
-      end
-      return releases
-    end
-
-    # return a hash of useful information for the latest release
-    # urls, subject, title, description and latest release notes
-    #
-    def announcement
-      cfg = Configuration.for("project") 
-      { 
-        :subject        => "#{cfg.name} #{TyrantManager::VERSION} Released",
-        :title          => "#{cfg.name} version #{TyrantManager::VERSION} has been released.",
-        :urls           => "#{cfg.homepage}",
-        :description    => "#{cfg.description.rstrip}",
-        :release_notes  => Utils.release_notes_from(cfg.history)[TyrantManager::VERSION].rstrip 
-      }
-    end
-  end
-end # << self