@@ -1,6 +1,6 @@ = conspire -(C) 2008 Phil Hagelberg +(c) 2008 Phil Hagelberg http://github.com/technomancy/conspire Conspire is a real-time collaborative editing platform using Git as a @@ -31,7 +31,8 @@ Repository history is cleared in between conspiracy sessions. You can manually use conspire if you want to try it out without an editor. Just launch +conspire+ with a directory as its only argument, and it will initialize a new git repository in there and launch a -conspiracy session. +conspiracy session. You will have to manually "git add" new files you +want to introduce to the session. For testing purposes, you can run two or more conspiracies on the same machine; you just have to specify an alternate port and name for the README.rdoc @@ -13,7 +13,7 @@ Hoe.new('conspire', Conspire::VERSION) do |p| # TODO: release on rubyforge once all our required dependency versions make it to rubyforge p.extra_deps << ['technomancy-gitjour', '6.3.0'] - p.extra_deps << 'clip' + p.extra_deps << 'alexvollmer-clip' end # vim: syntax=Ruby Rakefile @@ -9,6 +9,7 @@ options = Clip do |c| :default => Conspire::DEFAULTS[:sync_interval]) c.optional('n', 'name', :desc => "Session name; must include 'conspiracy'", :default => Conspire::DEFAULTS[:name]) + c.flag('v', 'version', :desc => 'Print version number and exit') end # TODO: show usage message on --help @@ -16,6 +17,9 @@ if !options.valid? puts "Conspire is a git-based collaboration platform." puts " You generally interact use it via an editor; see README for details." abort options.to_s +elsif options.version? + puts "conspire #{Conspire::VERSION}" + exit 0 end Conspire.start ARGV.first, options bin/conspire @@ -1,10 +1,10 @@ Gem::Specification.new do |s| s.name = %q{conspire} - s.version = "0.1.1" + s.version = "0.1.2" s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["Phil Hagelberg"] - s.date = %q{2008-07-25} + s.date = %q{2008-08-12} s.default_executable = %q{conspire} s.email = ["technomancy@gmail.com"] s.executables = ["conspire"] @@ -25,16 +25,16 @@ Gem::Specification.new do |s| if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then s.add_runtime_dependency(%q<technomancy-gitjour>, ["= 6.3.0"]) - s.add_runtime_dependency(%q<clip>, [">= 0"]) + s.add_runtime_dependency(%q<alexvollmer-clip>, [">= 0"]) s.add_development_dependency(%q<hoe>, [">= 1.7.0"]) else s.add_dependency(%q<technomancy-gitjour>, ["= 6.3.0"]) - s.add_dependency(%q<clip>, [">= 0"]) + s.add_dependency(%q<alexvollmer-clip>, [">= 0"]) s.add_dependency(%q<hoe>, [">= 1.7.0"]) end else s.add_dependency(%q<technomancy-gitjour>, ["= 6.3.0"]) - s.add_dependency(%q<clip>, [">= 0"]) + s.add_dependency(%q<alexvollmer-clip>, [">= 0"]) s.add_dependency(%q<hoe>, [">= 1.7.0"]) end -end +end \ No newline at end of file conspire.gemspec @@ -8,7 +8,7 @@ require File.dirname(__FILE__) + '/conspire/gitjour_exts' require File.dirname(__FILE__) + '/conspire/conspirator' module Conspire - VERSION = '0.1.1' + VERSION = '0.1.2' # TODO: play with optimal intervals; perhaps auto-adjust based on latency? DEFAULTS = { :port => 7456, :name => 'conspiracy', :sync_interval => 0.25 } HOSTNAME = `hostname`.chomp # TODO: is there a better way? lib/conspire.rb conspire/doc f6c33f28e8104efb6f54fcce77f39560bf309bef Phil Hagelberg technomancy@gmail.com http://github.com/technomancy/conspire/commit/c7a5882b11a1db411424f371eeefd1f0f537d0b7 c7a5882b11a1db411424f371eeefd1f0f537d0b7 2008-08-12T14:17:50-07:00 2008-08-12T14:17:50-07:00 add version command, release 0.1.2 d81644882547837149668c371e6c3d0e8dee85d9 Phil Hagelberg technomancy@gmail.com