bitcoin-cigs 0.0.2 → 0.0.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bitcoin-cigs (0.0.1)
+    bitcoin-cigs (0.0.3)
 
 GEM
   remote: http://rubygems.org/

data/bin/bitcoin-cigs

@@ -0,0 +1,52 @@
+#!/usr/bin/env ruby
+
+require 'optparse'
+require 'bitcoin-cigs'
+
+@options = {}
+
+opt_parser = OptionParser.new do |opt|
+  opt.banner = "Usage: bitcoin-cigs command [arguments ...] [options ...]"
+  opt.separator  ""
+  opt.separator  "Commands"
+  opt.separator  "     verify bitcoin-address signature [message-file]"
+  opt.separator  "     sign private-key [message-file]"
+  opt.separator  ""
+  opt.separator  "Options"
+  opt.on("-m", "--message MESSAGE", "Message can also be read from STDIN") do |message|
+    @options[:message] = message
+  end
+  opt.on("-S", "--no-strip", "Do not strip leading and trailing whitespace from message (stripped by default)") do
+    @options[:no_strip] = true
+  end
+end
+
+opt_parser.parse!
+
+def message
+  message = @options[:message] || ARGF.read
+  message.strip! unless @options[:no_strip]
+  
+  message
+end
+
+begin
+  case ARGV.shift
+  when "verify"
+    address = ARGV.shift or raise ArgumentError
+    signature = ARGV.shift or raise ArgumentError
+    ::BitcoinCigs.verify_message!(address, signature, message)
+  when "sign"
+    private_key = ARGV.shift or raise ArgumentError
+    puts ::BitcoinCigs.sign_message!(private_key, message)
+  else
+    raise ArgumentError
+  end
+  exit 0
+rescue ::BitcoinCigs::Error => e
+  puts "Error: #{e}"
+  exit 2
+rescue ArgumentError
+  puts opt_parser
+  exit 1
+end

data/bitcoin-cigs.gemspec

@@ -15,8 +15,9 @@ Gem::Specification.new do |s|
   s.rubyforge_project = "bitcoin-cigs"
 
   s.files = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.require_paths = ["lib"]
+  s.executables = ['bitcoin-cigs']
 
   s.add_development_dependency 'rspec', '~> 2.13.0'
   s.add_development_dependency 'rake', '~> 10.0.4'

data/lib/bitcoin_cigs.rb

@@ -45,13 +45,14 @@ module BitcoinCigs
       order = g.order
       
       sig = decode64(signature)
-      raise ::BitcoinCigs::Error.new("Bad signature") if sig.size != 65
+      raise ::BitcoinCigs::Error.new("Bad signature length") if sig.size != 65
+      raise ::BitcoinCigs::Error.new("Bad characters in signature") if signature != encode64(sig)
       
       hb = sig[0].ord
       r, s = [sig[1...33], sig[33...65]].collect { |s| str_to_num(s) }
       
       
-      raise ::BitcoinCigs::Error.new("Bad first byte") if hb < 27 || hb >= 35
+      raise ::BitcoinCigs::Error.new("Bad signature first byte") if hb < 27 || hb >= 35
       
       compressed = false
       if hb >= 31
@@ -79,7 +80,7 @@ module BitcoinCigs
     
       public_key = ::BitcoinCigs::PublicKey.new(g, q, compressed)
       addr = public_key_to_bc_address(public_key.ser(), network_version)
-      raise ::BitcoinCigs::Error.new("Bad address. Signing: #{addr}, Received: #{address}") if address != addr
+      raise ::BitcoinCigs::Error.new("Incorrect address or message for signature.") if address != addr
       
       nil
     end

data/lib/bitcoin_cigs/version.rb

@@ -1,3 +1,3 @@
 module BitcoinCigs
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/bitcoin_cigs_spec.rb

@@ -103,8 +103,7 @@ describe BitcoinCigs do
       let(:address) { "invalid" }
       
       it "raises ::BitcoinCigs::Error" do
-        # TODO: improve message
-        expect { subject }.to raise_error(::BitcoinCigs::Error, "Bad address. Signing: #{original_address}, Received: #{address}")
+        expect { subject }.to raise_error(::BitcoinCigs::Error, "Incorrect address or message for signature.")
       end
     end
     
@@ -112,7 +111,7 @@ describe BitcoinCigs do
       let(:signature) { "invalid" }
       
       it "raises ::BitcoinCigs::Error" do
-        expect { subject }.to raise_error(::BitcoinCigs::Error, "Bad signature")
+        expect { subject }.to raise_error(::BitcoinCigs::Error, "Bad signature length")
       end
     end
     
@@ -120,8 +119,7 @@ describe BitcoinCigs do
       let(:message) { "invalid" }
       
       it "raises ::BitcoinCigs::Error" do
-        # TODO: wrong message, also occurs in python version
-        expect { subject }.to raise_error(::BitcoinCigs::Error, "Bad address. Signing: 1Es3JV8zYTMtbg7rPMizYZYPc8rcvsJ21m, Received: #{address}")
+        expect { subject }.to raise_error(::BitcoinCigs::Error, "Incorrect address or message for signature.")
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bitcoin-cigs
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-06 00:00:00.000000000 Z
+date: 2013-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -46,7 +46,8 @@ dependencies:
 description: Create and Verify Bitcoin Signatures.
 email:
 - michaelgpearce@yahoo.com
-executables: []
+executables:
+- bitcoin-cigs
 extensions: []
 extra_rdoc_files: []
 files:
@@ -56,6 +57,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/bitcoin-cigs
 - bitcoin-cigs.gemspec
 - lib/bitcoin-cigs.rb
 - lib/bitcoin_cigs.rb