murder 0.1.1 → 0.1.2

data/README.md

@@ -13,6 +13,9 @@ centralized distribution systems wouldn't otherwise function. A "Murder" is
 normally used to refer to a flock of crows, which in this case applies to a
 bunch of servers doing something.
 
+For an intro video, see:
+[Twitter - Murder Bittorrent Deploy System](http://vimeo.com/11280885)
+
 
 QUICK START
 -----------
@@ -134,7 +137,7 @@ up on all hosts, then manually run the murder cap tasks:
 
 4. Stop the seeder and tracker:
 
-        cap murder:stop_seeding
+        cap murder:stop_seeding tag="Deploy1"
         cap murder:stop_tracker
 
 When this finishes, all peers will have the files in /tmp/Deploy1

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/murder.rb

@@ -35,7 +35,7 @@ Capistrano::Configuration.instance(:must_exist).load do
   # get around the fact that find_servers does not work in role evaluation
   # (it tries to evaluate all roles, leading to infinite recursion)
   role :peer do
-    roles.reject{|k,v| excluded_roles.include? k }.values.map(&:servers).flatten.uniq.reject{|s| s.options[:no_release] }
+    roles.reject{|k,v| excluded_roles.include? k }.values.map{|r| r.servers }.flatten.uniq.reject{|s| s.options[:no_release] }
   end
 
   role(:tracker) { roles[:peer].servers.first }

data/lib/murder/murder.rb

@@ -53,7 +53,7 @@ namespace :murder do
   DESC
   task :start_seeding, :roles => :seeder do
     require_tag
-    run "screen -dms 'seeder-#{tag}' python #{remote_murder_path}/murder_client.py seeder '#{filename}.torrent' '#{filename}' `host $HOSTNAME | awk '{print $4}'`"
+    run "screen -dms 'seeder-#{tag}' python #{remote_murder_path}/murder_client.py seeder '#{filename}.torrent' '#{filename}' `LC_ALL=C host $HOSTNAME | awk '/has address/ {print $4}' | head -n 1`"
   end
 
   desc <<-DESC
@@ -91,7 +91,7 @@ namespace :murder do
     end
 
     upload("#{filename}.torrent", "#{filename}.torrent", :via => :scp)
-    run "/usr/bin/time -f %e python #{remote_murder_path}/murder_client.py peer '#{filename}.torrent' '#{filename}' `host $CAPISTRANO:HOST$ | awk '{print $4}'`"
+    run "python #{remote_murder_path}/murder_client.py peer '#{filename}.torrent' '#{filename}' `LC_ALL=C host $CAPISTRANO:HOST$ | awk '/has address/ {print $4}' | head -n 1`"
 
     if ENV['path_is_file']
       run "cp #{filename} #{destination_path}"

data/murder.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{murder}
-  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 = ["Larry Gadea", "Matt Freels"]
-  s.date = %q{2010-04-13}
+  s.date = %q{2010-10-11}
   s.description = %q{Large scale server deploys using BitTorrent and the BitTornado library}
   s.email = %q{lg@twitter.com}
   s.extra_rdoc_files = [
@@ -85,14 +85,14 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/lg/murder}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Large scale server deploys using BitTorrent and the BitTornado library}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
     else
     end
   else

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: murder
 version: !ruby/object:Gem::Version 
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Larry Gadea
@@ -15,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-13 00:00:00 -07:00
+date: 2010-10-11 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -103,23 +104,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Large scale server deploys using BitTorrent and the BitTornado library