bitcoin2graphdb 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 518f182a04704a20cbb981b092b04f26bb5fa377
-  data.tar.gz: 079e1a6ad0b6ca97d3b35a8644b91a7292ef7a10
+  metadata.gz: 9810f791c591fa5cba2820318e56a559a68aac50
+  data.tar.gz: 5d0eb515b554e6237a34bc01c87f0887e72eb4a1
 SHA512:
-  metadata.gz: 710533c347d6a8b9dbf3d8094d5637e28071b4fd3830a2c2a451ca9fd5af746d687f78cc8c0a102eae4c50e5f69ab7bb9701f1d17d8bc1319bfe7e42d81562f2
-  data.tar.gz: bac0deec127d4f922743bf2903423db27303b4d6ca1160d79cf33a154bd9225b9cf94cd79b9d9ec99bed2a5a6ff3052f4dbffbee48a07ab607a95ec07c8227f5
+  metadata.gz: dfcee0a647b319afd958bad57a0e434b52ff23cc01208027fe63a38705f1f982b580f039eed15c92491be62164d8e47d9f6d9b1166e558368fc0c171236f30e3
+  data.tar.gz: 83c6bc425de2fd7ac11d7857a5ad06856f1449687bfb394ab8123eddc664379fa56e3b1f672cadde1dfd09b854600a34db7350257ba087e4ae06499ad74bbf93

data/README.md

@@ -1,4 +1,4 @@
-# Bitcoin2Graphdb [![Build Status](https://travis-ci.org/haw-itn/bitcoin2graphdb.svg?branch=master)](https://travis-ci.org/haw-itn/bitcoin2graphdb) [![Gem Version](https://badge.fury.io/rb/bitcoin2graphdb.svg)](https://badge.fury.io/rb/bitcoin2graphdb) [![MIT License](http://img.shields.io/badge/license-MIT-blue.svg?style=flat)](LICENSE) 
+# Bitcoin2Graphdb [![Build Status](https://travis-ci.org/haw-itn/bitcoin2graphdb.svg?branch=master)](https://travis-ci.org/haw-itn/bitcoin2graphdb) [![Gem Version](https://badge.fury.io/rb/bitcoin2graphdb.svg)](https://badge.fury.io/rb/bitcoin2graphdb) [![MIT License](http://img.shields.io/badge/license-MIT-blue.svg?style=flat)](LICENSE)
 
 A tool for import Bitcoin blockchain data into neo4j database.
 
@@ -56,6 +56,11 @@ bitcoin2graphdb:
 
 ## Usage
 
+* Show usage
+```
+$ bitcoin2graphdb help
+```
+
 * Start bitcoin2graphdb daemon
 ```
 $ bitcoin2graphdb start -c <configuration file path>
@@ -63,7 +68,7 @@ $ bitcoin2graphdb start -c <configuration file path>
 
 * Stop bitcoin2graphdb daemon
 ```
-$ bitcoin2graphdb stop 
+$ bitcoin2graphdb stop
 ```
 
 ## Extensions
@@ -73,7 +78,7 @@ Bitcoin2Graphdb currently supports following extensions.
 |Extension Key Name|Description|
 |:-----------|:------------|
 |open_assets| Add Open Assets Protocol support. If this extension is enabled, the asset quantity and Graphdb::Model::AssetId association will be added to the Graphdb::Model::TxOut.|
-* Open Assets Protocol  
+* Open Assets Protocol
 
 To enable extension, add an extension key name to enable the Configuration file like following.
 
@@ -86,13 +91,13 @@ bitcoin2graphdb:
 
 # Testing
 
-When you run rspec, you need to run neo4j test server(http://localhost:7475) in advance.   
-Others are the same as normal rspec. 
+When you run rspec, you need to run neo4j test server(http://localhost:7475) in advance.
+Others are the same as normal rspec.
 
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/haw-itn/bitcoin2graphdb. 
+Bug reports and pull requests are welcome on GitHub at https://github.com/haw-itn/bitcoin2graphdb.
 
 ## License
 
@@ -117,4 +122,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
-

data/bitcoin2graphdb.gemspec

@@ -19,10 +19,12 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "openassets-ruby", ">= 0.5.7"
+  spec.add_runtime_dependency "openassets-ruby", ">= 0.6.4"
   spec.add_runtime_dependency "daemon-spawn"
   spec.add_runtime_dependency "neo4j", "~>7.1.0"
   spec.add_runtime_dependency "activesupport", ">= 4.0.2"
+  spec.add_runtime_dependency "thor"
+
 
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"

data/exe/bitcoin2graphdb

@@ -1,38 +1,4 @@
 #!/usr/bin/env ruby
+require 'bitcoin2graphdb/cli'
 
-require "bundler/setup"
-require 'base'
-require 'optparse'
-require 'json'
-require 'yaml'
-require 'active_support/all'
-require 'daemon_spawn'
-
-class Bitcoin2GraphdbDaemon < DaemonSpawn::Base
-  def start(args)
-    puts "Bitcoin2GraphdbDaemon start : #{Time.now}"
-    migration = Bitcoin2Graphdb::Migration.new(config(args)[:bitcoin2graphdb])
-    migration.run
-  end
-
-  def stop
-    puts "Bitcoin2GraphdbDaemon stop : #{Time.now}"
-  end
-
-  private
-  def config(args)
-    config_index = args.index("-c")
-    if config_index && args.length > config_index + 1 && File.exists?(args[config_index + 1])
-      YAML.load(File.read(args[config_index + 1])).deep_symbolize_keys
-    else
-      raise ArgumentError.new 'configuration file not specified or does not exist.'
-    end
-  end
-end
-
-Bitcoin2GraphdbDaemon.spawn!({
-    working_dir: Dir.pwd,
-    log_file: File.expand_path(Dir.pwd + '/bitcoin2graphdb.log'),
-    pid_file: File.expand_path(Dir.pwd + '/bitcoin2graphdb.pid'),
-    sync_log: true,
-    singleton: true})
+Bitcoin2Graphdb::CLI.start(ARGV)

data/lib/bitcoin2graphdb/cli.rb

@@ -0,0 +1,61 @@
+require 'thor'
+require 'base'
+require 'json'
+require 'yaml'
+require 'active_support/all'
+require 'daemon_spawn'
+
+module Bitcoin2Graphdb
+  class Bitcoin2GraphdbDaemon < DaemonSpawn::Base
+    def start(args)
+      puts "Bitcoin2GraphdbDaemon start : #{Time.now}"
+      migration = Bitcoin2Graphdb::Migration.new(args[0][:bitcoin2graphdb])
+      migration.run
+    end
+
+    def stop
+      puts "Bitcoin2GraphdbDaemon stop : #{Time.now}"
+    end
+
+    private
+    def config(args)
+      config_index = args.index("-c")
+    end
+  end
+
+
+  class CLI < Thor
+    class_option :pid, aliases: '-p', default: Dir.pwd + '/bitcoin2graphdb.pid', banner: '<pid file path>'
+    class_option :log, aliases: '-l', default: Dir.pwd + '/bitcoin2graphdb.log', banner: '<log file path>'
+
+    option :conf, aliases: '-c' , required: true, banner: '<configuration file path>'
+    desc "start", "start bitcoin2graphdb daemon process"
+    def start(name="Ruby")
+      conf = if File.exists?(options[:conf])
+               YAML.load( File.read(options[:conf]) ).deep_symbolize_keys
+             else
+               raise ArgumentError.new(
+                       "configuration file[#{options[:conf]}] not specified or does not exist.")
+             end
+
+      Bitcoin2Graphdb::Bitcoin2GraphdbDaemon.spawn!(
+        {
+          working_dir: Dir.pwd,
+          log_file: File.expand_path(options[:log]),
+          pid_file: File.expand_path(options[:pid]),
+          sync_log: true,
+          singleton: true}, ['start', conf])
+    end
+
+    desc "stop", "stop bitcoin2graphdb daemon process"
+    def stop
+      Bitcoin2Graphdb::Bitcoin2GraphdbDaemon.spawn!(
+        {
+          working_dir: Dir.pwd,
+          log_file: File.expand_path(options[:log]),
+          pid_file: File.expand_path(options[:pid]),
+          sync_log: true,
+          singleton: true}, ['stop'])
+    end
+  end
+end

data/lib/bitcoin2graphdb/version.rb

@@ -1,3 +1,3 @@
 module Bitcoin2Graphdb
-  VERSION = "0.3.5"
+  VERSION = "0.3.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bitcoin2graphdb
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - azuchi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-14 00:00:00.000000000 Z
+date: 2017-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: openassets-ruby
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.7
+        version: 0.6.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.7
+        version: 0.6.4
 - !ruby/object:Gem::Dependency
   name: daemon-spawn
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.2
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -162,6 +176,7 @@ files:
 - lib/bitcoin2graphdb.rb
 - lib/bitcoin2graphdb/bitcoin.rb
 - lib/bitcoin2graphdb/bitcoin/blockchain_provider.rb
+- lib/bitcoin2graphdb/cli.rb
 - lib/bitcoin2graphdb/migration.rb
 - lib/bitcoin2graphdb/tasks/migration.rake
 - lib/bitcoin2graphdb/version.rb