xnlogic 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a36f328b2bd90b41f922303a653cf42dcdd1c0a
-  data.tar.gz: 560b489db76a202f188bcf5bb142a5ab291a4ff9
+  metadata.gz: fa72708b7d6bb824bb70d088bb44359ae12fc7d1
+  data.tar.gz: 0fa841e525c5f18b382fb3e0e75c7882027f5a4e
 SHA512:
-  metadata.gz: 8153d384b7cf0bdd904d8a3945fc2833da473a838b183b1f6b5f4bc4696e8dbd875725aecc1dea5cc0aab338d4a4a53afe937c455d54aef830f979d8bab92523
-  data.tar.gz: d6286dcad351a01986e82f96eb2b89a583da31c4c94507d72f2c450a6b006785e266d7467b74e502a3cf9ce147911f7111c96cbdb973d82aec4730aa2b1f0faf
+  metadata.gz: 1c9f58a79cff5f84cd763a48f51ee84360d5963b4d311a9c97967c118a45848493bd3c49a584c2a0f10933d0aedb3f4e7279fb8d474b740b3fb814edb0bc06d6
+  data.tar.gz: e0656f4709048767951b807f1fefcb8c75c127050555608e0956a1922ddc8ae7520e7d60ff6c8f793dd1a7c5ac29be8065a088675ddb56496e6387baff7c6544

data/lib/xnlogic/cli/application.rb

@@ -2,7 +2,7 @@ require 'pathname'
 
 module Xnlogic
   class CLI::Application
-    attr_reader :options, :app_name, :thor, :base_name, :name, :base, :app
+    attr_reader :options, :app_name, :thor, :base_name, :name, :app
 
     def initialize(options, app_name, thor)
       @options = options
@@ -10,9 +10,7 @@ module Xnlogic
       @thor = thor
 
       @name = app_name.chomp("/").tr('-', '_') # remove trailing slash if present
-      @base_name = options.fetch('base', name)
-      @base = Pathname.pwd.join(base_name)
-      @app = @base.join(name)
+      @app = Pathname.pwd.join(name)
     end
 
     def run
@@ -35,10 +33,12 @@ module Xnlogic
         "Vagrantfile.tt" => "Vagrantfile",
         "config/vagrant.provision.tt" => "config/vagrant.provision",
         "config/vagrant.settings.yml.tt" => "config/vagrant.settings.yml",
+        "config/datomic.conf" => "config/datomic.conf",
+        "config/transactor.properties" => "config/transactor.properties",
       }
 
       base_templates.each do |src, dst|
-        thor.template("vagrant/#{src}", base.join(dst), opts)
+        thor.template("vagrant/#{src}", app.join(dst), opts)
       end
 
       templates = {
@@ -47,7 +47,7 @@ module Xnlogic
         "Gemfile.tt" => "Gemfile",
         "Readme.md.tt" => "Readme.md",
         "config.ru.tt" => "config.ru",
-        "console.rb.tt" => "console.rb",
+        "dev/console.rb.tt" => "dev/console.rb",
         "torquebox.yml.tt" => "torquebox.yml",
         "torquebox_init.rb.tt" => "torquebox_init.rb",
         "lib/gemname.rb.tt" => "lib/#{namespaced_path}.rb",
@@ -83,7 +83,7 @@ module Xnlogic
       Xnlogic.ui.info ""
       Xnlogic.ui.info "Then run the following:"
       Xnlogic.ui.info ""
-      Xnlogic.ui.info "cd #{base_name}"
+      Xnlogic.ui.info "cd #{name}"
       Xnlogic.ui.info "vagrant up"
       Xnlogic.ui.info "vagrant ssh"
       Xnlogic.ui.info ""

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

@@ -7,3 +7,9 @@ gem 'pacer',          '>= 2.0.6'
 gem 'pacer-neo4j'
 gem 'pacer-model'
 gem 'pacer-mcfly'
+
+group :test do
+  gem 'rspec-core',         '2.13.1'
+  gem 'rspec-expectations', '2.13.0'
+  gem 'rr'
+end

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

@@ -7,3 +7,4 @@ Jarfile.*.lock
 pkg/*
 bin/*
 tmp/
+.vagrant

data/lib/xnlogic/templates/application/spec/spec_helper.rb.tt

@@ -26,6 +26,7 @@ RSpec.configure do |c|
   Pacer.hide_route_elements = true
   Pacer.verbose = false
   JRuby.objectspace = true
+  # Recommended mock/stub library: https://github.com/rr/rr
   c.mock_with :rr
 
   SpecApp = <%= config[:constant_name] %>.app graph: Pacer.tg, client_name: 'specs'

data/lib/xnlogic/templates/vagrant/Vagrantfile.tt

@@ -1,5 +1,5 @@
 # -*- mode: ruby -*-
-# vi: set ft=ruby :
+# vim: set ft=ruby :
 
 # Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
 VAGRANTFILE_API_VERSION = "2"
@@ -9,8 +9,11 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # options are documented and commented below. For a complete reference,
   # please see the online documentation at vagrantup.com.
 
-  # Variable for current folder
-  vagrant_dir = File.expand_path(File.dirname(__FILE__))
+  # Include config from config/settings.yml
+  require 'yaml'
+  current_folder = File.expand_path(File.dirname(__FILE__))
+  settings = YAML::load_file(current_folder + "/config/vagrant.settings.yml")
+  app_name = settings['XN_CLIENT']
 
   # Every Vagrant virtual environment requires a box to build off of.
   config.vm.box = "box-cutter/ubuntu1404"
@@ -34,7 +37,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   nfs_setting = RUBY_PLATFORM =~ /darwin/ || RUBY_PLATFORM =~ /linux/ || Vagrant.has_plugin?("vagrant-winnfsd")  
 
   # Setup auxiliary synced folder
-  # config.vm.synced_folder vagrant_dir + "/xn_apps", "/opt/xn_apps", create: true, id: "xn-apps", :nfs => nfs_setting, :mount_options => ['nolock,vers=3,udp']
+  config.vm.synced_folder Dir.pwd, "/home/vagrant/" + app_name, create: true, id: app_name, :nfs => nfs_setting, :mount_options => ['nolock,vers=3,udp']
   # config.vm.synced_folder "../data", "/vagrant_data"
   
   # Allow caching to be used (see the vagrant-cachier plugin)
@@ -53,10 +56,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     config.vbguest.no_remote = true
   end
 
-  # Include config from config/settings.yml
-  require 'yaml'
-  settings = YAML::load_file(vagrant_dir + "/config/vagrant.settings.yml")
-
   config.vm.provider "virtualbox" do |vb|
     # boot with headless mode
     vb.gui = false
@@ -73,12 +72,16 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
   p1 = settings['jruby_version']
   p2 = settings['timezone']
-  p3 = settings['XN_CLIENT']
   p4 = settings['DATOMIC_VERSION']
+  p5 = settings['pm_key']
+  p6 = settings['mcfly_key']
+  p7 = settings['pm_version']
+  p8 = settings['mcfly_version']
+
 
   config.vm.provision "shell" do |s|
     s.path = "config/vagrant.provision"
-    s.args   = [p1,p2,p3,p4]
+    s.args   = [p1,p2,app_name,p4,p5,p6,p7,p8]
     s.privileged = false
   end
 end

data/lib/xnlogic/templates/vagrant/config/datomic.conf

@@ -0,0 +1,39 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:           datomic
+# Short-Description:  Start datomic transactor
+### END INIT INFO
+#
+# Copyright (c) Vital Reactor LLC
+#
+# description: starts up datomic transactor in fixed location
+env PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin:$PATH
+env HOME=/opt/xn_apps
+env DAEMON=/usr/local/lib/datomic/bin/transactor
+env DAEMON_OPTS=/etc/datomic/transactor.properties
+env NAME=transactor
+env DESC=DatomicTransactor
+env APPDIR=/opt/xn_apps
+env PIDFILE=/opt/xn_apps/datomic.upstart.pid
+env DAEMONUSER=vagrant
+
+exec test -x $DAEMON || exit 1
+description "$DESC"
+
+start on startup
+stop on shutdown
+
+respawn
+respawn limit 10 5
+
+pre-start script
+        if [ ! -d "$APPDIR" ]; then
+                mkdir -p $APPDIR
+        fi
+end script
+
+exec start-stop-daemon --start -c $DAEMONUSER -m -p $PIDFILE --exec $DAEMON $DAEMON_OPTS
+
+post-stop script
+        rm -f $PIDFILE
+end script

data/lib/xnlogic/templates/vagrant/config/transactor.properties

@@ -0,0 +1,73 @@
+########### free mode config ###############
+protocol=free
+host=localhost
+#free mode will use 3 ports starting with this one:
+port=4334
+
+
+## OPTIONAL ####################################################
+# The dev: and free: protocols typically use three ports
+# starting with the selected :port, but you can specify the
+# other ports explicitly, e.g. for virtualization environs
+# that do not issue contiguous ports.
+
+# h2-port=4335
+# h2-web-port=4336
+
+
+
+################################################################
+# See http://docs.datomic.com/capacity.html
+
+
+# Recommended settings for -Xmx4g, ongoing usage.
+#memory-index-threshold=32m
+#memory-index-max=128m
+#object-cache-max=1g
+
+# Recommended settings for -Xmx4g import jobs.
+# memory-index-threshold=512m
+# memory-index-max=1g
+# object-cache-max=1g
+
+# Recommended settings for -Xmx1g usage, e.g. dev laptops.
+memory-index-threshold=32m
+memory-index-max=128m
+object-cache-max=128m
+
+# Further (possibly outdated) info:
+# http://support.datomic.com/customer/portal/articles/850962-handling-high-write-volumes
+
+
+
+## OPTIONAL ####################################################
+
+
+# Set to false to disable SSL between the peers and the transactor.
+# Default: true
+encrypt-channel=false
+
+# Data directory is used for dev: and free: storage, and
+# as a temporary directory for all storages.
+data-dir=/opt/xn_apps/datomic.data
+
+# Transactor will log here, see bin/logback.xml to configure logging.
+log-dir=/opt/xn_apps/datomic.log
+
+# Transactor will write process pid here on startup
+pid-file=/opt/xn_apps/datomic.pid
+
+
+
+
+## OPTIONAL ####################################################
+# See http://docs.datomic.com/capacity.html
+
+
+# Soft limit on the number of concurrent writes to storage.
+# Default: 4, Miniumum: 2
+# write-concurrency=4
+
+# Soft limit on the number of concurrent reads to storage.
+# Default: 2 times write-concurrency, Miniumum: 2
+# read-concurrency=8

data/lib/xnlogic/templates/vagrant/config/vagrant.provision.tt

@@ -6,11 +6,19 @@ if [ -z "$1" ]; then echo "jruby_version not set" && exit 1; else echo "jruby_ve
 if [ -z "$2" ]; then echo "timezone not set" && exit 1; fi
 if [ -z "$3" ]; then echo "XN_CLIENT not set" && exit 1; else echo "XN_CLIENT is set to $3"; fi
 if [ -z "$4" ]; then echo "DATOMIC_VERSION not set" && exit 1; fi
+if [ -z "$5" ]; then echo "pacer-model key not set" && exit 1; fi
+if [ -z "$6" ]; then echo "mcfly key not set" && exit 1; fi
+if [ -z "$7" ]; then echo "pacer-model version not set" && exit 1; fi
+if [ -z "$8" ]; then echo "mcfly version not set" && exit 1; fi
 
 # variables
 debug=
 jruby_version=$1
 timezone=$2
+pm_key=$5
+mcfly_key=$6
+pm_version=$7
+mcfly_version=$8
 
 silent() {
   if [[ $debug ]] ; then
@@ -61,7 +69,7 @@ curl -sSL https://get.rvm.io | silent bash -s stable --auto-dotfiles
 source $HOME/.rvm/scripts/rvm
 
 hr
-echo "Installing jRuby"
+echo "Installing JRuby"
 silent rvm mount -r https://s3.amazonaws.com/jruby.org/downloads/${jruby_version}/jruby-bin-${jruby_version}.tar.gz --verify-downloads 1
 rvm use jruby-${jruby_version} --default
 gem source -a https://rubygems.org
@@ -78,8 +86,8 @@ sudo update-java-alternatives -s java-7-oracle
 
 hr
 echo "Updating PATH"
-echo 'export PATH="$HOME/bin:~/xn.dev/cli-utils/bin:$PATH"' >> ~/.zshrc
-export PATH="$HOME/bin:~/xn.dev/cli-utils/bin:$PATH"
+export       PATH="$HOME/bin:$HOME/xn.dev/cli-utils/bin:$PATH"
+echo 'export PATH="$HOME/bin:$HOME/xn.dev/cli-utils/bin:$PATH"' >> ~/.zshrc
 
 hr
 echo "Installing Lein"
@@ -102,18 +110,19 @@ gem install --quiet torquebox-server -v '3.1.1'
 hr
 echo "Installing XN gems"
 hr
-wget https://www.dropbox.com/s/7ujc7jp508uxews/pacer-mcfly-0.7.2.pre-java.gem\?dl\=1 -O pacer-mcfly-0.7.2.pre-java.gem --quiet
-wget https://www.dropbox.com/s/jdo5yel0ya4cqv3/pacer-model-0.6.3.pre-java.gem?dl=1 -O pacer-model-0.6.3.pre-java.gem --quiet
-gem install --quiet pacer-mcfly-0.7.2.pre-java.gem pacer-model-0.6.3.pre-java.gem
-rm pacer-mcfly-0.7.2.pre-java.gem pacer-model-0.6.3.pre-java.gem
+wget https://www.dropbox.com/s/$mcfly_key/pacer-mcfly-$mcfly_version-java.gem -O pacer-mcfly-$mcfly_version-java.gem --quiet
+wget https://www.dropbox.com/s/$pm_key/pacer-model-$pm_version-java.gem -O pacer-model-$pm_version-java.gem --quiet
+gem install --quiet pacer-mcfly-$mcfly_version-java.gem pacer-model-$pm_version-java.gem
+rm pacer-mcfly-$mcfly_version-java.gem pacer-model-$pm_version-java.gem
 
 hr
 echo "Configuring XN"
 sudo mkdir -p /opt/xn_apps
 sudo chown vagrant /opt/xn_apps
 cd
-wget https://www.dropbox.com/s/1j4hyrzlfgra9gp/xn.dev.1.tbz -O $HOME/xn.dev.1.tbz --quiet
-tar -xjf xn.dev.1.tbz
+wget https://www.dropbox.com/s/qs1n0c6tig2jfwo/xn.dev.2.tbz -O $HOME/xn.dev.tbz --quiet
+tar -xjf xn.dev.tbz
+rm xn.dev.tbz
 cd xn.dev
 source script/setup_stack
 cd fe/xn.js
@@ -122,22 +131,30 @@ cd -
 rake --quiet new_tb_version bundle_fe_server fresh_fe_config fe_server_db_init
 
 hr
-echo "Starting Datomic"
+echo "Starting Datomic Service"
 hr
 cd $HOME
 wget https://www.dropbox.com/s/07wwxn8mbujxugb/datomic-free-0.9.4699.zip?dl=1 --quiet -O datomic.zip
 unzip datomic.zip
 rm datomic.zip
 sudo mv datomic-free-0.9.4699 /usr/local/lib/datomic
-sudo cp $HOME/xn.dev/config/etc_init_datomic.conf /etc/init/datomic.conf
+sudo cp /vagrant/config/datomic.conf /etc/init/datomic.conf
 sudo mkdir -p /etc/datomic
-sudo cp $HOME/xn.dev/config/transactor.properties /etc/datomic/transactor.properties
+sudo ln -s /vagrant/config/transactor.properties /etc/datomic/transactor.properties
 sudo initctl reload-configuration
 sudo start datomic
 
+hr
+echo "Customizing .zshrc for <%= config[:name] %> development"
+echo "export XN_CLIENT=<%= config[:name] %>" >> ~/.zshrc
+echo "alias xn-server='(cd ~/xn.dev; ./script/start);'" >> ~/.zshrc
+echo 'alias xn-console="(cd ~/$XN_CLIENT; bundle exec jruby -J-Xmx1g -J-XX:MaxPermSize=200m -S irb -I $HOME/$XN_CLIENT/lib -r $HOME/$XN_CLIENT/console)"' >> ~/.zshrc
+echo '[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" # Load RVM into a shell session *as a function*' >> ~/.zshrc
+echo '(cd $HOME/xn.dev; source script/setup_stack)' >> ~/.zshrc
+
 hr
 echo "Configuring <%= config[:name] %>"
-cd /vagrant/<%= config[:name] %>
+cd $HOME/<%= config[:name] %>
 bundle
 torquebox deploy
 hr

data/lib/xnlogic/templates/vagrant/config/vagrant.settings.yml.tt

@@ -1,8 +1,12 @@
 ---
 
-XN_CLIENT: '<%= config[:name] %>'
-timezone: 'America/Toronto'
-jruby_version: '1.7.16'
-DATOMIC_VERSION: '0.9.4755'
-vm_memory: '<%= config[:vm_memory] %>'
-vm_cpus: '<%= config[:vm_cpus] %>'
+XN_CLIENT:        '<%= config[:name] %>'
+timezone:         'America/Toronto'
+jruby_version:    '1.7.16'
+DATOMIC_VERSION:  '0.9.4755'
+vm_memory:        '<%= config[:vm_memory] %>'
+vm_cpus:          '<%= config[:vm_cpus] %>'
+mcfly_version:    '0.7.2.pre'
+mcfly_key:        '...'
+pm_version:       '0.6.3.pre'
+pm_key:           '...'

data/lib/xnlogic/version.rb

@@ -1,3 +1,3 @@
 module Xnlogic
-  VERSION = "1.0.6"
+  VERSION = "1.0.7"
 end

metadata

@@ -1,71 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: xnlogic
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Darrick Wiebe
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-02 00:00:00.000000000 Z
+date: 2014-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  requirement: !ruby/object:Gem::Requirement
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: bundler
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
-  requirement: !ruby/object:Gem::Requirement
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency
   name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+  type: :development
+  prerelease: false
   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: '10.0'
-  prerelease: false
+        version: 0.7.3
   type: :development
-- !ruby/object:Gem::Dependency
-  name: xn_gem_release_tasks
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.8
+        version: 0.7.3
+- !ruby/object:Gem::Dependency
+  name: xn_gem_release_tasks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.8
-  prerelease: false
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.8
 description: Build graph applications with XN Logic.
 email:
 - dw@xnlogic.com
@@ -74,7 +88,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - README.md
 - Rakefile
@@ -83,11 +97,13 @@ files:
 - lib/xnlogic/cli.rb
 - lib/xnlogic/cli/application.rb
 - lib/xnlogic/friendly_errors.rb
+- lib/xnlogic/man/xnlogic
+- lib/xnlogic/man/xnlogic.txt
 - lib/xnlogic/templates/application/.rspec.tt
 - lib/xnlogic/templates/application/Gemfile.tt
 - lib/xnlogic/templates/application/Readme.md.tt
 - lib/xnlogic/templates/application/config.ru.tt
-- lib/xnlogic/templates/application/console.rb.tt
+- lib/xnlogic/templates/application/dev/console.rb.tt
 - lib/xnlogic/templates/application/gitignore.tt
 - lib/xnlogic/templates/application/lib/fixtures/sample_fixtures.rb.tt
 - lib/xnlogic/templates/application/lib/gemname.rb.tt
@@ -105,6 +121,8 @@ files:
 - lib/xnlogic/templates/application/torquebox.yml.tt
 - lib/xnlogic/templates/application/torquebox_init.rb.tt
 - lib/xnlogic/templates/vagrant/Vagrantfile.tt
+- lib/xnlogic/templates/vagrant/config/datomic.conf
+- lib/xnlogic/templates/vagrant/config/transactor.properties
 - lib/xnlogic/templates/vagrant/config/vagrant.provision.tt
 - lib/xnlogic/templates/vagrant/config/vagrant.settings.yml.tt
 - lib/xnlogic/ui.rb
@@ -113,29 +131,27 @@ files:
 - lib/xnlogic/version.rb
 - man/xnlogic.ronn
 - xnlogic.gemspec
-- lib/xnlogic/man/xnlogic
-- lib/xnlogic/man/xnlogic.txt
 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.1.9
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.2.2
+signing_key: 
 specification_version: 4
 summary: XN Logic command-line tools
 test_files: []