bitcoin_testnet 0.0.1 → 0.1.0

data/README.md

@@ -12,7 +12,7 @@ Now, you have access to `BitcoinTestnet`.
 
 Second, you have to tell BitcoinTestnet where the testnet in a box directory is. I prefer to keep it in the test folder of my project. For example, with RSpec:
 
-    git submodule add https://github.com/freewil/bitcoin-testnet-box testnet
+    git submodule add https://github.com/freewil/bitcoin-testnet-box spec/testnet
 
 Then, in your `test_helper`/`spec_helper`:
 
@@ -20,15 +20,13 @@ Then, in your `test_helper`/`spec_helper`:
 
 Third, tell `BitcoinTestnet` when to do its work:
 
-- Before the test suite starts, call `BitcoinTestnet.start`. This will start the Testnet and clean it. If you have already started the Testnet yourself manually, it will just clean it.
-- Before each spec, call `BitcoinTestnet.clean`. This will reset the Testnet, so it looks like it did the first time you started the Testnet.
-- After the test suite is finished, call `BitcoinTestnet.stop`. This turns off the Testnet and cleans if. If you started the Testnet manually, then it just cleans it.
+- Before each spec, call `BitcoinTestnet.start`. This will start and clean the Testnet, so it looks like it did the first time you started the Testnet.
+- After the test suite is finished, call `BitcoinTestnet.stop`. This turns off the Testnet.
 
 Sample with RSpec:
 
     RSpec.configure do |config|
-      config.before(:suite) { BitcoinTestnet.start }
-      config.before(:each) { BitcoinTestnet.clean }
+      config.before(:each) { BitcoinTestnet.start }
       config.after(:suite) { BitcoinTestnet.stop }
     end
 

data/bitcoin_testnet.gemspec

@@ -19,4 +19,5 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_dependency 'activesupport', '~> 3.0'
+  gem.add_dependency 'wait', '~> 0.5.1'
 end

data/lib/bitcoin_testnet/booter.rb

@@ -7,32 +7,21 @@ module BitcoinTestnet
 
     def boot
       if Detector.exists?
-        puts "***** Testnet started manually; cleaning only"
-        BitcoinTestnet.started_manually = true
-        Cleaner.clean
+        Stopper.stop
       else
-        puts "***** Starting Testnet. To make boot up faster, start the Testnet manually: `cd #{BitcoinTestnet.dir} && make start`"
-        thread = Thread.new do
-          Cleaner.clean
-          Executor.execute "make start > /dev/null"
-        end
+        Executor.execute "make clean"
+      end
+
+      thread = Thread.new do
+        Executor.execute "make start"
+      end
 
-        # Wait until the bitcoind servers have started and ready to accept. I've
-        # found that the sweet spot was 2 seconds after the thread's status is
-        # false
-        wait_time = 0
-        until wait_time == 5
-          if thread.status == false
-            sleep 2
-            return
-          end
-          sleep 0.1
-          wait_time += 0.1
-        end
+      Wait.new.until do
+        thread.status == false && Executor.execute("make getinfo")
+      end
 
-        unless Detector.exists?
-          fail "The bitcoin processes didn't seem to start. Please ensure that the bitcoin testnet servers started at `#{BitcoinTestnet.dir}`"
-        end
+      unless Detector.exists?
+        fail "The bitcoin processes didn't seem to start. Please ensure that the bitcoin testnet servers started at `#{BitcoinTestnet.dir}`"
       end
     end
 

data/lib/bitcoin_testnet/detector.rb

@@ -10,7 +10,7 @@ module BitcoinTestnet
     end
 
     def processes
-      `ps -ef | grep bitcoin | grep -v grep`.split("\n")
+      `ps -ef | grep "bitcoind -datadir=" | grep -v grep`.split("\n")
     end
 
     def exists?

data/lib/bitcoin_testnet/executor.rb

@@ -10,8 +10,10 @@ module BitcoinTestnet
     end
 
     def execute
-      commands = ["cd #{BitcoinTestnet.dir}"] + @commands
-      system commands.join(' && ')
+      Dir.chdir BitcoinTestnet.dir do
+        commands = @commands.map { |c| "#{c} > /dev/null"}
+        system commands.join(' && ')
+      end
     end
 
   end

data/lib/bitcoin_testnet/stopper.rb

@@ -0,0 +1,21 @@
+module BitcoinTestnet
+  class Stopper
+
+    def self.stop
+      self.new.stop
+    end
+
+    def stop
+      kill_bitcoind if Detector.exists?
+      Wait.new.until { !Detector.exists? }
+      fail "Looks like it didn't stop" if Detector.exists?
+      Executor.execute "make clean"
+    end
+
+    private
+
+    def kill_bitcoind
+      system %Q(kill -9 `ps -ef | grep "bitcoind -datadir=" | grep -v grep | awk '{print $2}'`)
+    end
+  end
+end

data/lib/bitcoin_testnet/version.rb

@@ -1,3 +1,3 @@
 module BitcoinTestnet
-  VERSION = "0.0.1"
+  VERSION = "0.1.0"
 end

data/lib/bitcoin_testnet.rb

@@ -1,16 +1,13 @@
+require 'wait'
 require "bitcoin_testnet/version"
 require 'active_support/core_ext/module'
 
 require 'bitcoin_testnet/detector'
-require 'bitcoin_testnet/booter'
-require 'bitcoin_testnet/cleaner'
 require 'bitcoin_testnet/executor'
-require 'bitcoin_testnet/janitor'
+require 'bitcoin_testnet/booter'
+require 'bitcoin_testnet/stopper'
 
 module BitcoinTestnet
-  mattr_accessor :started_manually
-  @@started_manually = false
-
   mattr_accessor :dir
   @@dir = nil
 
@@ -18,18 +15,13 @@ module BitcoinTestnet
     Booter.boot
   end
 
-  def self.clean
-    Cleaner.clean
-  end
-
   def self.stop
-    Janitor.sweep
+    Stopper.stop
   end
 
   def self.configure_rspec!
     RSpec.configure do |c|
-      c.before(:suite) { BitcoinTestnet.start }
-      c.before(:each) { BitcoinTestnet.clean }
+      c.before(:each) { BitcoinTestnet.start }
       c.after(:suite) { BitcoinTestnet.stop }
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bitcoin_testnet
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-03 00:00:00.000000000 Z
+date: 2013-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -27,6 +27,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: wait
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.1
 description: A gem of helpers for making integration tests with the Bitcoin testnet
   a little easier.
 email:
@@ -44,10 +60,9 @@ files:
 - bitcoin_testnet.gemspec
 - lib/bitcoin_testnet.rb
 - lib/bitcoin_testnet/booter.rb
-- lib/bitcoin_testnet/cleaner.rb
 - lib/bitcoin_testnet/detector.rb
 - lib/bitcoin_testnet/executor.rb
-- lib/bitcoin_testnet/janitor.rb
+- lib/bitcoin_testnet/stopper.rb
 - lib/bitcoin_testnet/version.rb
 - testnet/1/bitcoin.conf
 - testnet/1/testnet3/blk0001.dat

data/lib/bitcoin_testnet/cleaner.rb

@@ -1,14 +0,0 @@
-module BitcoinTestnet
-  class Cleaner
-
-    def self.clean(*args)
-      self.new(*args).clean
-    end
-
-    def clean
-      commands = ["cd #{BitcoinTestnet.dir}", "make clean > /dev/null"]
-      system commands.join(' && ')
-    end
-
-  end
-end

data/lib/bitcoin_testnet/janitor.rb

@@ -1,20 +0,0 @@
-module BitcoinTestnet
-  class Janitor
-
-    def self.sweep(*args)
-      self.new(*args).sweep
-    end
-
-    def sweep
-      if BitcoinTestnet.started_manually
-        puts "\n***** Since Testnet started manually; cleaning only. If you want to stop it, run: `cd #{BitcoinTestnet.dir} && make stop`"
-        Cleaner.clean
-      else
-        puts "\n***** Since the BitcoinTestnet started the Testnet, stop and clean"
-        Executor.execute "make stop > /dev/null"
-        Cleaner.clean
-      end
-    end
-
-  end
-end