allow rpc creds to be set via config

Author: MatzFan

README.md

@@ -27,18 +27,27 @@ Or install it yourself as:
 
 ## Authentication
 
-RPC server login credentials (registered account name and password) must be stored in the following environment variables:-
+RPC server login credentials (registered account name and password) must be stored in the following environment variables or set in the configuation (see below):-
 
   `$BITSHARES_ACCOUNT`
 
   `$BITSHARES_PASSWORD`
 
 ## Configuration
 
+Config settings may be set via a hash or Yaml file.
+
+**Via a hash**
+
+RPC server login credentials may be set as follows:
+```Ruby
+Bitshares.configure(:rpc_username => 'whatever')
+Bitshares.configure(:rpc_password => 'whatever')
+```
+
 The Gem allows multiple wallet names and passwords to be stored so that actions requiring these data may be automated.
 To use this functionality - i.e. with the Wallet class (see below) wallet names and passwords must be configured in either of the following ways:
 
-**Via a hash**
 ```Ruby
 Bitshares.configure(:wallet => {'wallet1' => 'password1'})
 Bitshares.configure(:wallet => {'wallet2' => 'password2'})
@@ -177,7 +186,7 @@ cny_bts_trader.order_list # lists orders for the account and market - optional l
 cny_bts_trader.submit_bid(quantity, price) # buy <quantity> of Market base (BTS here) at <price> (quote/base)
 cny_bts_trader.submit_ask(quantity, price) # sell <quantity> of Market base (BTS here) at <price> (quote/base)
   # both return respective order id
-  
+
 cny_bts_trader.cancel_orders(*order_ids) # cancels one or more orders for the account and market
   # returns array of memo's e.g. 'cancel ASK-90189b6e'
 ```

lib/bitshares.rb

@@ -18,7 +18,8 @@
 # stackoverflow.com/questions/6233124/where-to-place-access-config-file-in-gem
 module Bitshares
 
-  @config = {:wallet => {nil => nil}} # name/password key/value pairs
+  @config = {rpc_username: nil, rpc_password: nil,
+             :wallet => {nil => nil}} # name/password key/value pairs
 
   @valid_keys = @config.keys
 

lib/bitshares/client.rb

@@ -6,8 +6,8 @@ class Err < RuntimeError; end
 
     def self.init
       bitshares_running?
-      user = ENV['BITSHARES_ACCOUNT']
-      password = ENV['BITSHARES_PASSWORD']
+      user = ENV['BITSHARES_ACCOUNT'] || Bitshares.config[:rpc_username]
+      password = ENV['BITSHARES_PASSWORD'] || Bitshares.config[:rpc_password]
       @uri = URI("http://localhost:#{rpc_http_port}/rpc")
       @req = Net::HTTP::Post.new(@uri)
       @req.content_type = 'application/json'

lib/bitshares/version.rb

@@ -1,3 +1,3 @@
 module Bitshares
-  VERSION = '0.1.5'
+  VERSION = '0.1.6'
 end

spec/client_spec.rb

@@ -4,6 +4,11 @@
 
 describe Bitshares::Client do
 
+  before do
+    Bitshares.configure(:rpc_username => ENV['BITSHARES_ACCOUNT'])
+    Bitshares.configure(:rpc_password => ENV['BITSHARES_PASSWORD'])
+  end
+
   let(:client) { CLIENT }
 
   context '#new' do
@@ -31,26 +36,62 @@
   end
 
   context '#rpc_request' do
-    it 'with invalid username raise Bitshares::Client::Err "Bad credentials"' do
-      stub_const('ENV', ENV.to_hash.merge('BITSHARES_ACCOUNT' => 'wrong_password'))
-      Bitshares::Client.init
-      expect(->{client.get_info}).to raise_error Bitshares::Client::Err, 'Bad credentials'
-    end
+    context 'using ENV credentials' do
+      it 'with invalid username raises Bitshares::Client::Err "Bad credentials"' do
+        stub_const('ENV', ENV.to_hash.merge('BITSHARES_ACCOUNT' => 'wrong_username'))
+        Bitshares::Client.init
+        expect(->{client.get_info}).to raise_error Bitshares::Client::Err, 'Bad credentials'
+      end
 
-    it 'with invalid password raise Bitshares::Client::Err "Bad credentials"' do
-      stub_const('ENV', ENV.to_hash.merge('BITSHARES_PASSWORD' => 'wrong_password'))
-      Bitshares::Client.init
-      expect(->{client.get_info}).to raise_error Bitshares::Client::Err, 'Bad credentials'
-    end
+      it 'with invalid password raises Bitshares::Client::Err "Bad credentials"' do
+        stub_const('ENV', ENV.to_hash.merge('BITSHARES_PASSWORD' => 'wrong_password'))
+        Bitshares::Client.init
+        expect(->{client.get_info}).to raise_error Bitshares::Client::Err, 'Bad credentials'
+      end
 
-    it 'with valid credentials and invalid client command raises Bitshares::Client::Err' do
-      Bitshares::Client.init
-      expect(->{client.not_a_cmd}).to raise_error Bitshares::Client::Err
+      it 'with valid credentials and invalid client command raises Bitshares::Client::Err' do
+        Bitshares::Client.init
+        expect(->{client.not_a_cmd}).to raise_error Bitshares::Client::Err
+      end
+
+      it 'with valid credentials and valid client command returns a Hash of returned JSON data' do
+        Bitshares::Client.init
+        expect(client.get_info.class).to eq Hash
+      end
     end
 
-    it 'with valid credentials and valid client command returns a Hash of returned JSON data' do
-      Bitshares::Client.init
-      expect(client.get_info.class).to eq Hash
+    context 'using config credentials' do
+
+      it 'with invalid username raises Bitshares::Client::Err "Bad credentials"' do
+        Bitshares.configure(:rpc_username => 'wrong_username')
+        stub_const('ENV', ENV.to_hash.merge('BITSHARES_ACCOUNT' => nil))
+        stub_const('ENV', ENV.to_hash.merge('BITSHARES_PASSWORD' => nil))
+        Bitshares::Client.init
+        expect(->{client.get_info}).to raise_error Bitshares::Client::Err, 'Bad credentials'
+      end
+
+      it 'with invalid password raises Bitshares::Client::Err "Bad credentials"' do
+        Bitshares.configure(:rpc_password => 'wrong_password')
+        stub_const('ENV', ENV.to_hash.merge('BITSHARES_ACCOUNT' => nil))
+        stub_const('ENV', ENV.to_hash.merge('BITSHARES_PASSWORD' => nil))
+        Bitshares::Client.init
+        expect(->{client.get_info}).to raise_error Bitshares::Client::Err, 'Bad credentials'
+      end
+
+      it 'with valid credentials and invalid client command raises Bitshares::Client::Err' do
+        stub_const('ENV', ENV.to_hash.merge('BITSHARES_ACCOUNT' => nil))
+        stub_const('ENV', ENV.to_hash.merge('BITSHARES_PASSWORD' => nil))
+        Bitshares::Client.init
+        expect(->{client.not_a_cmd}).to raise_error Bitshares::Client::Err
+      end
+
+      it 'with valid credentials and valid client command returns a Hash of returned JSON data' do
+        stub_const('ENV', ENV.to_hash.merge('BITSHARES_ACCOUNT' => nil))
+        stub_const('ENV', ENV.to_hash.merge('BITSHARES_PASSWORD' => nil))
+        Bitshares::Client.init
+        expect(client.get_info.class).to eq Hash
+      end
+
     end
   end