xnlogic 1.0.47 → 1.0.48

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41f8211f8a5de7dc84e0816f00c71908f3b1c33b
-  data.tar.gz: 476ffcb9433d22f8d5bb82c504a1ab9b16036c68
+  metadata.gz: a94264646ea8fe2f922c4a504056f62a78c9942b
+  data.tar.gz: c060a64898a4ae29ef74cd53b4ffd499cc0a6dba
 SHA512:
-  metadata.gz: 14e345a872c2dd7b8d8609e557cc7c465c520e7ea167f01a8e093ff2c58da81cb10c423933c3919d0f1e52305b7d316de694465ad8c57e162cbd69010cff0e23
-  data.tar.gz: 3bdaeef7062d7861e9db51b10591e113a143f817f84d5a3da7a42f32986f4cb62315944a6c9b7e8d0cc8b912e07846f2de6c643b3e3aadec15b2e9c6202009f6
+  metadata.gz: 749dd53681cd731df6a3a844efeb7a4728c02d81204da6261e6d38d123e22f68596f9a293a3d9e66a0f6418d11cc21f91906336b35962cd7097d4a1229138c1b
+  data.tar.gz: f8f91ad4ac84e4bedfe4e9f7bf37d44e0142da4c23deaee18e3672d2c08f146363455dde404c64b0c4a46e2155b6710b380c039af6951a8aa9a425efff061ecd

data/lib/xnlogic/cli.rb

@@ -63,6 +63,9 @@ module Xnlogic
         "Number of Virtual CPUs the Development VM should use (default 2)"
       method_option "memory", type: :numeric, banner:
         "Amount of RAM to allow the Development VM to use (default 2048, in MB)"
+      method_option "graph", type: :string,
+        enum: %w[neo4j neo4j2 neo4j2-enterprise orient history-graph],
+        banner: "The graph engine to use by default (default neo4j2)"
       method_option "root", type: :string, banner:
         "Optionally specify a different root directory name"
       method_option "provision", type: :boolean, banner:

data/lib/xnlogic/cli/application.rb

@@ -18,9 +18,14 @@ module Xnlogic
       @root = options.fetch('root', @name)
       @app = Pathname.pwd.join(root)
       options['name'] = @name
+      set_default_options!
       self
     end
 
+    def set_default_options!
+      options['graph'] ||= 'neo4j2'
+    end
+
     def options_filename
       'config/app_options.yaml'
     end
@@ -35,6 +40,7 @@ module Xnlogic
       @app = Pathname.pwd.join(root)
       super()
       @name ||= options['name']
+      set_default_options!
       self
     end
 
@@ -162,6 +168,18 @@ module Xnlogic
       end
     end
 
+    def orient?
+      options['graph'] == 'orient'
+    end
+
+    def neo?
+      options['graph'] =~ /neo4j/
+    end
+
+    def neo_ent?
+      options['graph'] == 'neo4j2-enterprise'
+    end
+
     def template_options
       namespaced_path = name
       constant_name = namespaced_path.split('_').map{|p| p[0..0].upcase + p[1..-1] }.join
@@ -177,6 +195,10 @@ module Xnlogic
         :vm_cpus                  => options['cpus'],
         :vm_memory                => options['memory'],
         :xn_key                   => options['key'],
+        :graph                    => options['graph'],
+        :neo4j                    => neo?,
+        :neo4j_enterprise         => neo_ent?,
+        :orient                   => orient?,
         :datomic_pro              => datomic_pro?,
         :datomic_license          => datomic_license,
         :datomic_mysql            => options['datomic_mysql'],
@@ -228,6 +250,10 @@ module Xnlogic
         datomic_installer => 'script/install_transactor.sh',
       }
 
+      if neo?
+        base_templates['config/neo4j.properties.tt'] = 'config/neo4j.properties'
+      end
+
       if datomic_pro?
         base_templates['datomic/m2_settings.xml.tt'] = 'config/m2_settings.xml'
         base_templates['datomic/pom.xml.tt'] = 'config/pom.xml'

data/lib/xnlogic/templates/application/gemspec.tt

@@ -23,13 +23,20 @@ Gem::Specification.new do |s|
   s.add_dependency 'rack', '1.5.2'
   s.add_dependency 'pacer', '>= 2.0.6'
   s.add_dependency 'pacer-model'
-  s.add_dependency 'pacer-neo4j'
+<% if config[:neo4j] -%>
+  s.add_dependency 'pacer-neo4j2'
+<%   if config[:neo4j_enterprise] -%>
+  s.add_dependency 'pacer-neo4j2-enterprise'
+<%   end -%>
+<% elsif config[:orient] -%>
+  s.add_dependency 'pacer-orient'
+<% end -%>
   s.add_dependency 'pacer-mcfly'
 <% if config[:datomic_pro] -%>
   s.add_dependency 'pacer-mcfly-pro'<%= ", " + config[:optional_datomic_version].inspect if config[:optional_datomic_version] %>
-<% if config[:datomic_mysql] -%>
+<%   if config[:datomic_mysql] -%>
   s.add_dependency 'pacer-mcfly-mysql'
-<% end -%>
+<%   end -%>
 <% else -%>
   s.add_dependency 'pacer-mcfly-free'<%= ", " + config[:optional_datomic_version].inspect if config[:optional_datomic_version] %>
 <% end -%>

data/lib/xnlogic/templates/application/lib/gemname.rb.tt

@@ -1,12 +1,7 @@
-if RUBY_VERSION == '1.8.7'
-  STDERR.puts <<WARNING
-WARNING: XN Logic is developed using JRuby in 1.9 mode. I recommend you
-  restart JRuby in 1.9 mode, either with the --1.9 flag, or by
-  defaulting to 1.9 mode by setting the environment variable
-  JRUBY_OPTS=--1.9
-WARNING
-  raise "1.8 mode: no go"
-end
+require 'java'
+
+# XN settings must be configured before calling require 'pacer-model'
+java.lang.System.setProperty("xn.relVersion", "2")
 
 require 'rubygems'
 require 'bundler/setup'
@@ -96,6 +91,7 @@ end
 require '<%= config[:namespaced_path] %>/version'
 require '<%= config[:namespaced_path] %>/type'
 
+PacerModel.default_graph_engine = <%= config[:graph].inspect %>
 PacerModel.load_mcfly_config_yaml(<%= config[:constant_name] %>.config_file('mcfly_config.yml'), <%= config[:constant_name] %>.env)
 
 PacerModel.applications['<%= config[:name] %>'] = <%= config[:constant_name] %>

data/lib/xnlogic/templates/vagrant/config/neo4j.properties.tt

@@ -0,0 +1,114 @@
+################################################################
+# Neo4j
+#
+# neo4j.properties - database tuning parameters
+#
+################################################################
+
+# Enable this to be able to upgrade a store from an older version.
+#allow_store_upgrade=true
+
+# The amount of memory to use for mapping the store files, in bytes (or
+# kilobytes with the 'k' suffix, megabytes with 'm' and gigabytes with 'g').
+# If Neo4j is running on a dedicated server, then it is generally recommended
+# to leave about 2-4 gigabytes for the operating system, give the JVM enough
+# heap to hold all your transaction state and query context, and then leave the
+# rest for the page cache.
+# The default page cache memory assumes the machine is dedicated to running
+# Neo4j, and is heuristically set to 75% of RAM minus the max Java heap size.
+#dbms.pagecache.memory=10g
+
+# Keep logical logs, helps debugging but uses more disk space, enabled for
+# legacy reasons To limit space needed to store historical logs use values such
+# as: "7 days" or "100M size" instead of "true".
+#keep_logical_logs=7 days
+
+# Enable shell server so that remote clients can connect via Neo4j shell.
+#remote_shell_enabled=true
+# The network interface IP the shell will listen on (use 0.0.0 for all interfaces).
+#remote_shell_host=127.0.0.1
+# The port the shell will listen on, default is 1337.
+#remote_shell_port=1337
+
+# The type of cache to use for nodes and relationships.
+<% if config[:neo4j_enterprise] -%>
+#cache_type=hpc
+<% else -%>
+#cache_type=soft
+<% end -%>
+
+# Percentage, 0-100, of memory available for caching to use for caching. Default is 50%.
+# cache.memory_ratio=
+
+# Maximum size of the heap memory to dedicate to the cached nodes.
+# http://neo4j.com/docs/2.2.1/configuration-caches.html#config_node_cache_size
+#node_cache_size=
+
+# Maximum size of the heap memory to dedicate to the cached relationships.
+#relationship_cache_size=
+
+<% if config[:neo4j_enterprise] -%>
+# Enable online backups to be taken from this database.
+online_backup_enabled=true
+
+# Port to listen to for incoming backup requests.
+online_backup_server=127.0.0.1:6362
+
+
+# Uncomment and specify these lines for running Neo4j in High Availability mode.
+# See the High availability setup tutorial for more details on these settings
+# http://neo4j.com/docs/2.2.1/ha-setup-tutorial.html
+
+# ha.server_id is the number of each instance in the HA cluster. It should be
+# an integer (e.g. 1), and should be unique for each cluster instance.
+ha.server_id=
+
+# ha.initial_hosts is a comma-separated list (without spaces) of the host:port
+# where the ha.cluster_server of all instances will be listening. Typically
+# this will be the same for all cluster instances.
+#ha.initial_hosts=192.168.0.1:5001,192.168.0.2:5001,192.168.0.3:5001
+ha.initial_hosts=
+
+# IP and port for this instance to listen on, for communicating cluster status
+# information iwth other instances (also see ha.initial_hosts). The IP
+# must be the configured IP address for one of the local interfaces.
+#ha.cluster_server=192.168.0.1:5001
+ha.cluster_server=
+
+# IP and port for this instance to listen on, for communicating transaction
+# data with other instances (also see ha.initial_hosts). The IP
+# must be the configured IP address for one of the local interfaces.
+#ha.server=192.168.0.1:6001
+ha.server=
+
+# The interval at which slaves will pull updates from the master. Comment out
+# the option to disable periodic pulling of updates. Unit is seconds.
+ha.pull_interval=10
+
+# Amount of slaves the master will try to push a transaction to upon commit
+# (default is 1). The master will optimistically continue and not fail the
+# transaction even if it fails to reach the push factor. Setting this to 0 will
+# increase write performance when writing through master but could potentially
+# lead to branched data (or loss of transaction) if the master goes down.
+ha.tx_push_factor=1
+
+# Strategy the master will use when pushing data to slaves (if the push factor
+# is greater than 0). There are two options available "fixed" (default) or
+# "round_robin". Fixed will start by pushing to slaves ordered by server id
+# (highest first) improving performance since the slaves only have to cache up
+# one transaction at a time.
+ha.tx_push_strategy=fixed
+
+# Policy for how to handle branched data.
+branched_data_policy=keep_all
+
+# Clustering timeouts
+# Default timeout.
+ha.default_timeout=5s
+
+# How often heartbeat messages should be sent. Defaults to ha.default_timeout.
+ha.heartbeat_interval=5s
+
+# Timeout for heartbeats between cluster members. Should be at least twice that of ha.heartbeat_interval.
+heartbeat_timeout=11s
+<% end -%>

data/lib/xnlogic/version.rb

@@ -1,3 +1,3 @@
 module Xnlogic
-  VERSION = "1.0.47"
+  VERSION = "1.0.48"
 end

metadata

@@ -1,86 +1,72 @@
 --- !ruby/object:Gem::Specification
 name: xnlogic
 version: !ruby/object:Gem::Version
-  version: 1.0.47
+  version: 1.0.48
 platform: ruby
 authors:
 - Darrick Wiebe
 - David Colebatch
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-04-29 00:00:00.000000000 Z
+date: 2015-05-05 00:00:00.000000000 Z
 dependencies:
 - !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
     requirements:
-    - - "~>"
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.7'
-  type: :development
+        version: '0'
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: bundler
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
-- !ruby/object:Gem::Dependency
-  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
+        version: '1.7'
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: rake
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: ronn
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.3
-  type: :development
+        version: '10.0'
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.7.3
+  type: :development
 - !ruby/object:Gem::Dependency
   name: xn_gem_release_tasks
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.1.8
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.1.8
+  prerelease: false
+  type: :development
 description: Graph application framework with xnlogic.com
 email:
 - dw@xnlogic.com
@@ -90,7 +76,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
 - Gemfile
 - README.md
 - Rakefile
@@ -138,6 +124,7 @@ files:
 - lib/xnlogic/templates/vagrant/Vagrantfile.tt
 - lib/xnlogic/templates/vagrant/config/datomic.conf
 - lib/xnlogic/templates/vagrant/config/diagnostics.sh
+- lib/xnlogic/templates/vagrant/config/neo4j.properties.tt
 - lib/xnlogic/templates/vagrant/config/start.sh
 - lib/xnlogic/templates/vagrant/config/vagrant.provision.tt
 - lib/xnlogic/templates/vagrant/config/vagrant.up.tt
@@ -163,24 +150,24 @@ files:
 homepage: https://xnlogic.com
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.3
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.4.5
+signing_key:
 specification_version: 4
 summary: XN Logic command-line tools
 test_files: []