hyperledger_cli 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6b553695f7523ac8899dab3c2b7009e592c59e0
-  data.tar.gz: 87666f87bd90fc623ec9f163967fd58f51bdc141
+  metadata.gz: 4d2174e7c21b489561aa6dbd1aab4b161b2c2628
+  data.tar.gz: 8863df31ff095d92d07238dce0b741fe9124ed9a
 SHA512:
-  metadata.gz: c7cb6e924e5350359d266e02da95a1c5856a9fb9428d348d8d33c79db3ce0e535ebcc9c9e29029b48e3b0789d76974acc7e37695cbac400031733a8152126b44
-  data.tar.gz: 8a69bc584622f0eae37ec1aa28fefed24e46840de4c82363dc803dc219cde4abcd9f09fb9a5bc8d9f0d019ce8c459fcdd1aa08d40a24025028b6a97915d91d7e
+  metadata.gz: 209041ebc8493afb1b073b73f1756b52c7f32368b36ebed905a7b9812885e77bd0c4e3f27a66e270f6f255c09d74147e78920549e82710b1459b466ca3404361
+  data.tar.gz: 56c436c92c1a26e7b8f7344f81b7fbdc68fdc11d0af61a04101a812a544a795fc43689707a5954df674fc5d2e51cafb5c71d12c3438c6dfb7faf52786b78c536

data/bin/hyperledger

@@ -9,7 +9,6 @@ require 'json'
 
 module ErrorPrinter
   def print_error(err)
-    puts 'There seems to have been a problem... :-/'
     puts "Error: #{err}"
     errors = JSON.parse(err.response, symbolize_names: true)[:errors]
     if errors
@@ -23,28 +22,30 @@ class Ledger < Thor
   
   desc 'list', 'List all known ledgers'
   def list
-    response = RestClient.get "#{options[:server]}/currencies", content_type: :json
+    response = RestClient.get "#{options[:server]}/ledgers", content_type: :json, accept: :json
     data = JSON.parse(response.body, symbolize_names: true)
-    data[:currencies].each do |c| puts c[:name] end
+    data[:ledgers].each do |c| puts c[:name] end
   end
   
   desc 'register <name> <url>', 'Registers a new ledger. The name must be unique, and the URL should contain more information about the ledger.'
   def register(name, url)
-    key = OpenSSL::PKey::RSA.new 2048
-    data = { public_key: key.public_key.to_pem, name: name, url: url }
+    ledger_key = OpenSSL::PKey::RSA.new 2048
+    primary_account_key = OpenSSL::PKey::RSA.new 2048
+    ledger_data = { public_key: ledger_key.public_key.to_pem, name: name, url: url }
+    primary_account_data = { public_key: primary_account_key.public_key.to_pem }
     
     begin
-      response = RestClient.post "#{options[:server]}/currencies", data, content_type: :json
-      currency = JSON.parse(response.body, symbolize_names: true)[:currency]
+      response = RestClient.post "#{options[:server]}/ledgers", { ledger: ledger_data, primary_account: primary_account_data }, content_type: :json, accept: :json
+      ledger = JSON.parse(response.body, symbolize_names: true)[:ledger]
       puts 'New ledger created'
-      puts "name:\t#{currency[:name]}"
-      puts "url:\t#{currency[:url]}"
-      puts "primary account code:\t#{currency[:primary_account][:code]}"
+      puts "name:\t#{ledger[:name]}"
+      puts "url:\t#{ledger[:url]}"
+      puts "primary account code:\t#{ledger[:primary_account][:code]}"
       
       # Write key
       FileUtils.mkdir_p "#{ENV['HOME']}/.mintet"
-      open "#{ENV['HOME']}/.mintet/#{currency[:primary_account][:code]}.pem", 'w' do |io| io.write key.to_pem end
-      open "#{ENV['HOME']}/.mintet/#{name}.pem", 'w' do |io| io.write key.to_pem end
+      open "#{ENV['HOME']}/.mintet/#{ledger[:primary_account][:code]}.pem", 'w' do |io| io.write primary_account_key.to_pem end
+      open "#{ENV['HOME']}/.mintet/#{name}.pem", 'w' do |io| io.write ledger_key.to_pem end
     rescue => e
       print_error(e)
     end
@@ -56,7 +57,7 @@ class Account < Thor
   
   desc 'list', 'List all known accounts'
   def list
-    response = RestClient.get "#{options[:server]}/accounts", content_type: :json
+    response = RestClient.get "#{options[:server]}/accounts", content_type: :json, accept: :json
     data = JSON.parse(response.body, symbolize_names: true)
     data[:accounts].each do |a|
       a.each do |k, v|
@@ -67,12 +68,12 @@ class Account < Thor
   end
   
   desc 'register <ledger>', 'Registers a new account in <ledger>.'
-  def register(currency)
+  def register(ledger)
     key = OpenSSL::PKey::RSA.new 2048
-    data = { public_key: key.public_key.to_pem, currency: currency }
+    data = { public_key: key.public_key.to_pem, ledger: ledger }
     
     begin
-      resp = RestClient.post "#{options.server}/accounts", data, content_type: :json
+      resp = RestClient.post "#{options.server}/accounts", { account: data }, content_type: :json, accept: :json
       account = JSON.parse(resp.body, symbolize_names: true)[:account]
       puts 'New account created'
       puts "code:\t\t#{account[:code]}"
@@ -99,15 +100,15 @@ class Hyperledger < Thor
   subcommand 'account', Account
   
   desc 'issue <amount> <ledger>', 'Issue <amount> new units to <ledger>.'
-  def issue(amount, currency)
-    data = { currency: currency, amount: amount }
+  def issue(amount, ledger)
+    data = { ledger: ledger, amount: amount }
     
-    key = OpenSSL::PKey::RSA.new File.read("#{ENV['HOME']}/.mintet/#{currency.downcase}.pem")
+    key = OpenSSL::PKey::RSA.new File.read("#{ENV['HOME']}/.mintet/#{ledger.downcase}.pem")
     sign = Base64.encode64 key.sign(OpenSSL::Digest::SHA256.new, data.to_json)
     
     begin
-      resp = RestClient.post "#{options[:server]}/issues", { issue: data, signature: sign }, content_type: :json
-      puts "#{amount} new units issued to #{currency}"
+      resp = RestClient.post "#{options[:server]}/issues", { issue: data, signature: sign }, content_type: :json, accept: :json
+      puts "#{amount} new units issued to #{ledger}"
     rescue => e
       print_error(e)
     end

data/lib/hyperledger_cli/version.rb

@@ -1,3 +1,3 @@
 module HyperledgerCli
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hyperledger_cli
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Daniel Feichtinger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-28 00:00:00.000000000 Z
+date: 2014-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -103,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.3.0
 signing_key: 
 specification_version: 4
 summary: A sample CLI for the Hyperledger protocol.