xnlogic 1.0.39 → 1.0.40

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0ba4a44bf36ec61d2a41ab8cfdd243a4a499d49
-  data.tar.gz: 0f6ae558ef71ed8905289a59cf65fe360607f6dd
+  metadata.gz: c3536880927910f75a9baed65b5c2f4decd31a29
+  data.tar.gz: 6bc3eeccae6bc2d897b85ad0b5bfe97de2880c1b
 SHA512:
-  metadata.gz: 9674d002f35022a00999256ea34c7dab2d05a04d03258a6450d11ca95cec65436fd0afbfd2ec8ade660daad601f7242643fdf43bd371576dfd271e73621f49e9
-  data.tar.gz: 558fe4928b331cce5b4e7f6be1fde6874693f8e097412c3125fa23727d5cf25b064cacf7a72965238a74c736cf36df85829952203c05d28319828b19e07436be
+  metadata.gz: a1c1f2be3dffaa49f778ff4aff3706aa9c6af90a99f68f31cccb80d7a71ed03ae45353fcf90c4469dffbec4f3e8bad3de9821aea91651b901333004fb11b60f2
+  data.tar.gz: e7d9e373bed6eb283d483c9c13f3d2e22368a941afa109e333bd8160fd400a3d49feaf6590d57cbffbd301faa2976a7ab3aaecbdab858713451c0ab2795f8e11

data/lib/xnlogic/cli/application.rb

@@ -137,27 +137,53 @@ module Xnlogic
       write_options
     end
 
+    def datomic_pro?
+      options.fetch('datomic_pro', options['datomic_mysql'])
+    end
+
+    def check_arguments
+      if datomic_pro?
+        if options['datomic_license']
+          unless datomic_license
+            Xnlogic.ui.warn "[WARN] Datomic license file '#{ options['datomic_license'] }' not found."
+          end
+        else
+          Xnlogic.ui.warn "[WARN] No datomic-license specified. Pro transacter will not start."
+        end
+        unless options['datomic_username'] and options['datomic_key']
+          Xnlogic.ui.warn "[WARN] No datomic-username or datomic-key. Will not be able to fetch datomic pro jar dependencies."
+        end
+      end
+    end
+
+    def datomic_license
+      if options['datomic_license'] and File.exist? options['datomic_license']
+        File.read(options['datomic_license']).sub(/^license-key=/, '')
+      end
+    end
 
     def template_options
       namespaced_path = name
       constant_name = namespaced_path.split('_').map{|p| p[0..0].upcase + p[1..-1] }.join
       git_user_name = `git config user.name`.chomp
       git_user_email = `git config user.email`.chomp
+      check_arguments
       {
-        :name                    => name,
-        :namespaced_path         => namespaced_path,
-        :constant_name           => constant_name,
-        :author                  => git_user_name.empty? ? "TODO: Write your name" : git_user_name,
-        :email                   => git_user_email.empty? ? "TODO: Write your email address" : git_user_email,
-        :vm_cpus                 => options['cpus'],
-        :vm_memory               => options['memory'],
-        :xn_key                  => options['key'],
-        :datomic_pro             => options.fetch('datomic_pro', options['datomic_mysql']),
-        :datomic_mysql           => options['datomic_mysql'],
-        :datomic_version         => options['datomic_version'],
-        :default_datomic_version => "0.9.5130",
-        :datomic_username        => options.fetch('datomic_username', '[username from my.datomic.com]'),
-        :datomic_key             => options.fetch('datomic_key', '[key from my.datomic.com]'),
+        :name                     => name,
+        :namespaced_path          => namespaced_path,
+        :constant_name            => constant_name,
+        :author                   => git_user_name.empty? ? "TODO: Write your name" : git_user_name,
+        :email                    => git_user_email.empty? ? "TODO: Write your email address" : git_user_email,
+        :vm_cpus                  => options['cpus'],
+        :vm_memory                => options['memory'],
+        :xn_key                   => options['key'],
+        :datomic_pro              => datomic_pro?,
+        :datomic_license          => datomic_license,
+        :datomic_mysql            => options['datomic_mysql'],
+        :datomic_optional_version => options['datomic_version'],
+        :datomic_version          => (options['datomic_version'] || "0.9.5130"),
+        :datomic_username         => options.fetch('datomic_username', '[username from my.datomic.com]'),
+        :datomic_key              => options.fetch('datomic_key', '[key from my.datomic.com]'),
       }
     end
 
@@ -176,20 +202,34 @@ module Xnlogic
 
 
     def generate_vm_config
+      transactor_properties = if options['datomic_mysql']
+                                "datomic/mysql.properties.tt"
+                              elsif options['datomic_pro']
+                                "datomic/pro.properties.tt"
+                              else
+                                "datomic/free.properties.tt"
+                              end
+      datomic_installer = if datomic_pro?
+                            'datomic/install_pro_transactor.sh.tt'
+                          else
+                            'datomic/install_free_transactor.sh.tt'
+                          end
       base_templates = {
         "Vagrantfile.tt" => "Vagrantfile",
         "Gemfile.tt" => "Gemfile",
         "config/vagrant.provision.tt" => "config/vagrant.provision",
+        "config/vagrant.up.tt" => "config/vagrant.up",
         "config/datomic.conf" => "config/datomic.conf",
         "config/start.sh" => "config/start.sh",
-        "config/transactor.properties" => "config/transactor.properties",
+        transactor_properties => "config/transactor.properties",
         "config/xnlogic.conf.tt" => "config/xnlogic.conf",
-        'datomic/update_datomic.sh.tt' => 'script/update_datomic.sh',
+        datomic_installer => 'script/install_transactor.sh',
       }
 
-      if options['datomic_pro'] || options['datomic_mysql']
+      if datomic_pro?
         base_templates['datomic/m2_settings.xml.tt'] = 'config/m2_settings.xml'
         base_templates['datomic/pom.xml.tt'] = 'config/pom.xml'
+        base_templates['datomic/get_datomic_jar.sh.tt'] = 'script/get_datomic_jar.sh'
       end
 
       _generate_templates(base_templates, 'vagrant', template_options, 'Creating Vagrant configuration')

data/lib/xnlogic/cli.rb

@@ -79,6 +79,8 @@ module Xnlogic
         "Your my.datomic.com account username, needed for Datomic jar downloads"
       method_option "datomic_key", type: :string, banner:
         "Your my.datomic.com download key, needed for Datomic jar downloads"
+      method_option "datomic_license", type: :string, banner:
+        "File location of your my.datomic.com license key, needed for the Datomic Pro transactor"
     end
 
     desc "application [NAME] [OPTIONS]", <<EOD

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

@@ -26,12 +26,12 @@ Gem::Specification.new do |s|
   s.add_dependency 'pacer-neo4j'
   s.add_dependency 'pacer-mcfly'
 <% if config[:datomic_pro] -%>
-  s.add_dependency 'pacer-mcfly-pro'<%= ", " + config[:datomic_version].inspect if config[:datomic_version] %>
-  <% if config[:datomic_mysql] -%>
+  s.add_dependency 'pacer-mcfly-pro'<%= ", " + config[:optional_datomic_version].inspect if config[:optional_datomic_version] %>
+<% if config[:datomic_mysql] -%>
   s.add_dependency 'pacer-mcfly-mysql'
-  <% end -%>
+<% end -%>
 <% else -%>
-  s.add_dependency 'pacer-mcfly-free'<%= ", " + config[:datomic_version].inspect if config[:datomic_version] %>
+  s.add_dependency 'pacer-mcfly-free'<%= ", " + config[:optional_datomic_version].inspect if config[:optional_datomic_version] %>
 <% end -%>
 
   s.add_dependency 'jruby-openssl', '0.9.6'

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

@@ -92,4 +92,9 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     s.path = "config/vagrant.provision"
     s.privileged = false
   end
+
+  config.vm.provision "shell", run: 'always' do |s|
+    s.path = "config/vagrant.up"
+    s.privileged = false
+  end
 end

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

@@ -20,7 +20,7 @@ printf "%$(tput cols)s\n"|tr " " "-"
 hr
 echo "Configuring environment"
 export XN_CLIENT=<%= config[:name] %>
-export DATOMIC_VERSION=0.9.4755
+export DATOMIC_VERSION=<%= config[:datomic_version] %>
 export DEBIAN_FRONTEND=noninteractive
 export LANG=en_US.UTF-8
 export LC_ALL=en_US.UTF-8
@@ -74,17 +74,7 @@ if [ -d $HOME/$XN_CLIENT/assets ]; then
 fi
 
 ## Uncomment to upgrade Datomic
-# export DATOMIC_VERSION=0.9.5130
-# hr
-# echo "Installing Datomic Service"
-# cd $HOME
-# wget https://s3.amazonaws.com/xn-datomic/datomic-free-${datomic_version}.zip?dl=1 --quiet -O datomic.zip
-# unzip datomic.zip
-# rm datomic.zip
-# sudo mv datomic-free-${datomic_version} /usr/local/lib/datomic
-# sudo mkdir -p /etc/datomic
-# sudo rm -f /etc/datomic/transactor.properties
-# sudo ln -s $HOME/$XN_CLIENT/config/transactor.properties /etc/datomic/transactor.properties
+# script/install_transactor.sh
 
 hr
 echo "Starting Datomic Service"
@@ -109,9 +99,6 @@ echo "alias gd='git diff -w'" >> ~/.zshrc
 echo "alias gdc='git diff -w --cached'" >> ~/.zshrc
 
 sudo apt-get install -y dos2unix
-silent dos2unix $SERVER_START_SCRIPT $HOME/$XN_CLIENT/script/*
-chmod +x $SERVER_START_SCRIPT
-chmod +x $HOME/$XN_CLIENT/script/update_datomic.sh
 
 git config --global --add alias.co "checkout"
 git config --global --add alias.ci "commit"

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

@@ -0,0 +1,25 @@
+#! /bin/bash
+
+silent() {
+  if [[ $debug ]] ; then
+    "$@"
+  else
+    "$@" &>/dev/null
+  fi
+}
+hr() {
+printf "%$(tput cols)s\n"|tr " " "-"
+}
+
+export XN_CLIENT=<%= config[:name] %>
+SERVER_START_SCRIPT="$HOME/$XN_CLIENT/config/start.sh"
+silent dos2unix $SERVER_START_SCRIPT $HOME/$XN_CLIENT/script/*
+chmod +x $SERVER_START_SCRIPT
+chmod +x $HOME/$XN_CLIENT/script/*
+
+<% if config[:datomic_pro] -%>
+silent $HOME/$XN_CLIENT/script/get_datomic_jar.sh
+if [ $? -ne 0 ]; then
+  >&2 echo "Failed to get Datomic dependency. Run $HOME/$XN_CLIENT/script/get_datomic_jar.sh for details."
+fi
+<% end -%>

data/lib/xnlogic/templates/vagrant/datomic/{update_datomic.sh.tt → get_datomic_jar.sh.tt}

@@ -5,6 +5,3 @@ cd $HOME/$XN_CLIENT/config
 mkdir -p $HOME/.m2
 cp m2_settings.xml $HOME/.m2/settings.xml
 mvn package
-cd -
-
-

data/lib/xnlogic/templates/vagrant/datomic/install_free_transactor.sh.tt

@@ -0,0 +1,20 @@
+#! /bin/bash
+
+echo "Installing Datomic Free <%= config[:datomic_version] %> Transactor"
+cd $HOME
+wget https://my.datomic.com/downloads/free/<%=config[:datomic_version]%> --quiet -O datomic.zip
+unzip datomic.zip
+rm datomic.zip
+sudo mv datomic-free-<%= config[:datomic_version] %> /usr/local/lib/datomic
+sudo mkdir -p /opt/datomic
+sudo chown vagrant:vagrant /opt/datomic
+mv datomic-free-<%=config[:datomic_version]%> /opt/datomic
+sudo mkdir -p /etc/datomic
+sudo rm -f /etc/datomic/transactor.properties
+sudo ln -s $HOME/$XN_CLIENT/config/transactor.properties /etc/datomic/transactor.properties
+sudo service datomic stop
+rm /opt/datomic/current
+ln -s /opt/datomic/datomic-free-<%=config[:datomic_version]%> /opt/datomic/current
+sudo service datomic start
+cd -
+

data/lib/xnlogic/templates/vagrant/datomic/install_pro_transactor.sh.tt

@@ -0,0 +1,24 @@
+#! /bin/bash
+
+echo "Installing Datomic Pro <%=config[:datomic_version]%> Transactor"
+cd $HOME
+wget --http-user=<%=config[:datomic_username]%> --http-password=<%=config[:datomic_key]%> https://my.datomic.com/repo/com/datomic/datomic-pro/<%=config[:datomic_version]%>/datomic-pro-<%=config[:datomic_version]%>.zip -O datomic.zip
+unzip datomic.zip
+rm datomic.zip
+sudo mkdir -p /opt/datomic
+sudo chown vagrant:vagrant /opt/datomic
+mv datomic-pro-<%=config[:datomic_version]%> /opt/datomic
+sudo mkdir -p /etc/datomic
+sudo rm -f /etc/datomic/transactor.properties
+sudo ln -s $HOME/$XN_CLIENT/config/transactor.properties /etc/datomic/transactor.properties
+<% if config[:datomic_mysql] -%>
+  wget http://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-java-5.1.35.tar.gz -O mysql.tgz
+  tar -xvzf mysql.tgz --include '*bin.jar'
+  sudo mv mysql-connector-java-5.1.35/*.jar /opt/datomic/datomic-pro-<%=config[:datomic_version]%>/lib
+  rm mysql.tgz
+<% end -%>
+sudo service datomic stop
+rm /opt/datomic/current
+ln -s /opt/datomic/datomic-pro-<%=config[:datomic_version]%> /opt/datomic/current
+sudo service datomic start
+cd -

data/lib/xnlogic/templates/vagrant/datomic/mysql.properties.tt

@@ -0,0 +1,131 @@
+################################################################
+
+protocol=sql
+host=localhost
+port=4334
+
+
+
+################################################################
+# See http://docs.datomic.com/storage.html
+
+license-key=<%= config[:datomic_license] %>
+
+
+
+################################################################
+# See http://docs.datomic.com/storage.html
+
+sql-url=jdbc:mysql://localhost:3306/datomic
+sql-user=datomic
+sql-password=datomic
+
+# The Postgres driver is included with Datomic. For other SQL
+# databases, you will need to install the driver on the
+# transactor classpath, by copying the file into lib/,
+# and place the driver on your peer's classpath.
+sql-driver-class=com.mysql.jdbc.Driver
+
+# Driver specified params, as semicolon-separated pairs.
+# Optional
+# sql-driver-params=<param1=val1&param2=val2...>
+
+# The query used to validate JDBC connection.
+# Optional
+# sql-validation-query=select 1
+
+
+
+################################################################
+# See http://docs.datomic.com/capacity.html
+
+
+# Recommended settings for -Xmx4g production usage.
+# memory-index-threshold=32m
+# memory-index-max=512m
+# object-cache-max=1g
+
+# Recommended settings for -Xmx1g usage, e.g. dev laptops.
+memory-index-threshold=32m
+memory-index-max=256m
+object-cache-max=128m
+
+
+
+## OPTIONAL ####################################################
+
+
+# Set to false to disable SSL between the peers and the transactor.
+# Default: true
+# encrypt-channel=true
+
+# Data directory is used for dev: and free: storage, and
+# as a temporary directory for all storages.
+# data-dir=data
+
+# Transactor will log here, see bin/logback.xml to configure logging.
+# log-dir=log
+
+# Transactor will write process pid here on startup
+# pid-file=transactor.pid
+
+
+
+## OPTIONAL ####################################################
+# See http://docs.datomic.com/storage.html
+# Memcached configuration.
+
+# memcached=host:port,host:port,...
+# memcached-username=datomic
+# memcached-password=datomic
+
+
+
+## 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
+
+
+
+## OPTIONAL ####################################################
+# See http://docs.datomic.com/aws.html
+# Optional settings for rotating logs to S3
+# (Can be auto-generated by bin/datomic ensure-transactor.)
+
+# aws-s3-log-bucket-id=
+
+
+
+## OPTIONAL ####################################################
+# See http://docs.datomic.com/aws.html
+# Optional settings for Cloudwatch metrics.
+# (Can be auto-generated by bin/datomic ensure-transactor.)
+
+aws-cloudwatch-region=us-east-1
+
+# Pick a unique name to distinguish transactor metrics from different systems.
+# aws-cloudwatch-dimension-value=
+
+
+
+## OPTIONAL ####################################################
+# See http://docs.datomic.com/ha.html
+
+
+# # The transactor will write a heartbeat into storage on this interval.
+# A standby transactor will take over if it sees the heartbeat go
+# unwritten  for 2x this interval. If your transactor load leads to
+# long gc pauses, you can increase this number to prevent the standby
+# transactor from unnecessarily taking over during a long gc pause.
+# Default: 5000, Miniumum: 5000
+# heartbeat-interval-msec=5000
+
+

data/lib/xnlogic/templates/vagrant/datomic/pom.xml.tt

@@ -22,7 +22,7 @@
     <dependency>
       <groupId>com.datomic</groupId>
       <artifactId>datomic-pro</artifactId>
-      <version><%= config[:datomic_version] || config[:default_datomic_version] %></version>
+      <version><%= config[:datomic_version] %></version>
     </dependency>
   </dependencies>
 </project>

data/lib/xnlogic/templates/vagrant/datomic/pro.properties.tt

@@ -0,0 +1,104 @@
+################################################################
+
+protocol=dev
+host=localhost
+port=4334
+
+
+
+################################################################
+# See http://docs.datomic.com/storage.html
+
+license-key=<%= config[:datomic_license] %>
+
+
+
+## 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 production usage.
+# memory-index-threshold=32m
+# memory-index-max=512m
+# object-cache-max=1g
+
+# Recommended settings for -Xmx1g usage, e.g. dev laptops.
+memory-index-threshold=32m
+memory-index-max=256m
+object-cache-max=128m
+
+
+
+## OPTIONAL ####################################################
+
+
+# Set to false to disable SSL between the peers and the transactor.
+# Default: true
+# encrypt-channel=true
+
+# Data directory is used for dev: and free: storage, and
+# as a temporary directory for all storages.
+# data-dir=data
+
+# Transactor will log here, see bin/logback.xml to configure logging.
+# log-dir=log
+
+# Transactor will write process pid here on startup
+# pid-file=transactor.pid
+
+
+
+## OPTIONAL ####################################################
+# See http://docs.datomic.com/storage.html
+# Memcached configuration.
+
+# memcached=host:port,host:port,...
+# memcached-username=datomic
+# memcached-password=datomic
+
+
+
+## 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
+
+
+
+## OPTIONAL ####################################################
+# See http://docs.datomic.com/aws.html
+# Optional settings for rotating logs to S3
+# (Can be auto-generated by bin/datomic ensure-transactor.)
+
+# aws-s3-log-bucket-id=
+
+
+
+## OPTIONAL ####################################################
+# See http://docs.datomic.com/aws.html
+# Optional settings for Cloudwatch metrics.
+# (Can be auto-generated by bin/datomic ensure-transactor.)
+
+# aws-cloudwatch-region=
+
+# Pick a unique name to distinguish transactor metrics from different systems.
+# aws-cloudwatch-dimension-value=your-system-name
+

data/lib/xnlogic/version.rb

@@ -1,3 +1,3 @@
 module Xnlogic
-  VERSION = "1.0.39"
+  VERSION = "1.0.40"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xnlogic
 version: !ruby/object:Gem::Version
-  version: 1.0.39
+  version: 1.0.40
 platform: ruby
 authors:
 - Darrick Wiebe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-30 00:00:00.000000000 Z
+date: 2015-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -136,12 +136,17 @@ files:
 - lib/xnlogic/templates/vagrant/Vagrantfile.tt
 - lib/xnlogic/templates/vagrant/config/datomic.conf
 - lib/xnlogic/templates/vagrant/config/start.sh
-- lib/xnlogic/templates/vagrant/config/transactor.properties
 - lib/xnlogic/templates/vagrant/config/vagrant.provision.tt
+- lib/xnlogic/templates/vagrant/config/vagrant.up.tt
 - lib/xnlogic/templates/vagrant/config/xnlogic.conf.tt
+- lib/xnlogic/templates/vagrant/datomic/free.properties.tt
+- lib/xnlogic/templates/vagrant/datomic/get_datomic_jar.sh.tt
+- lib/xnlogic/templates/vagrant/datomic/install_free_transactor.sh.tt
+- lib/xnlogic/templates/vagrant/datomic/install_pro_transactor.sh.tt
 - lib/xnlogic/templates/vagrant/datomic/m2_settings.xml.tt
+- lib/xnlogic/templates/vagrant/datomic/mysql.properties.tt
 - lib/xnlogic/templates/vagrant/datomic/pom.xml.tt
-- lib/xnlogic/templates/vagrant/datomic/update_datomic.sh.tt
+- lib/xnlogic/templates/vagrant/datomic/pro.properties.tt
 - lib/xnlogic/ui.rb
 - lib/xnlogic/ui/shell.rb
 - lib/xnlogic/ui/silent.rb