xnlogic 1.0.38 → 1.0.39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc4111984be1fc417fe78986cb0517ec967814c8
-  data.tar.gz: e12af67f7dab1abbd3994e750356dfb4ca4176da
+  metadata.gz: a0ba4a44bf36ec61d2a41ab8cfdd243a4a499d49
+  data.tar.gz: 0f6ae558ef71ed8905289a59cf65fe360607f6dd
 SHA512:
-  metadata.gz: bef4cc70bc4d4c90edab266e1717a1cbb2479bba6d2a05d669574282e89a6fa103db27c8c7fefa4aef83b537f186c3e88e51fc34ed4866fd9c308f35a5ff46f6
-  data.tar.gz: 5077bd4e9979b37005a89b626f0f96253b660c160f425c6e09c5b2d46e9d4d7c7ade3ae16cf6973aa53bdf2791c14453e92735caaaf4ed47769bfb5b004d5800
+  metadata.gz: 9674d002f35022a00999256ea34c7dab2d05a04d03258a6450d11ca95cec65436fd0afbfd2ec8ade660daad601f7242643fdf43bd371576dfd271e73621f49e9
+  data.tar.gz: 558fe4928b331cce5b4e7f6be1fde6874693f8e097412c3125fa23727d5cf25b064cacf7a72965238a74c736cf36df85829952203c05d28319828b19e07436be

data/lib/xnlogic/cli/application.rb

@@ -144,14 +144,20 @@ module Xnlogic
       git_user_name = `git config user.name`.chomp
       git_user_email = `git config user.email`.chomp
       {
-        :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'],
+        :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]'),
       }
     end
 
@@ -178,8 +184,14 @@ module Xnlogic
         "config/start.sh" => "config/start.sh",
         "config/transactor.properties" => "config/transactor.properties",
         "config/xnlogic.conf.tt" => "config/xnlogic.conf",
+        'datomic/update_datomic.sh.tt' => 'script/update_datomic.sh',
       }
 
+      if options['datomic_pro'] || options['datomic_mysql']
+        base_templates['datomic/m2_settings.xml.tt'] = 'config/m2_settings.xml'
+        base_templates['datomic/pom.xml.tt'] = 'config/pom.xml'
+      end
+
       _generate_templates(base_templates, 'vagrant', template_options, 'Creating Vagrant configuration')
     end
 

data/lib/xnlogic/cli.rb

@@ -69,6 +69,16 @@ module Xnlogic
         "Update the VM with the new provisioning settings"
       method_option "up", type: :boolean, banner:
         "Start the the VM (will provision automatically only on the first run)"
+      method_option "datomic_version", type: :string, banner:
+        "Optionally specify the desired Datomic version number"
+      method_option "datomic_pro", type: :boolean, banner:
+        "Use pacer-mcfly-pro instead of pacer-mcfly-free"
+      method_option "datomic_mysql", type: :boolean, banner:
+        "Add pacer-mcfly-mysql dependency. Implies datomic-pro."
+      method_option "datomic_username", type: :string, banner:
+        "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"
     end
 
     desc "application [NAME] [OPTIONS]", <<EOD

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

@@ -25,7 +25,14 @@ Gem::Specification.new do |s|
   s.add_dependency 'pacer-model'
   s.add_dependency 'pacer-neo4j'
   s.add_dependency 'pacer-mcfly'
-  s.add_dependency 'pacer-mcfly-free'
+<% 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-mysql'
+  <% end -%>
+<% else -%>
+  s.add_dependency 'pacer-mcfly-free'<%= ", " + config[:datomic_version].inspect if config[:datomic_version] %>
+<% end -%>
 
   s.add_dependency 'jruby-openssl', '0.9.6'
   s.add_dependency 'torquebox', '3.1.1'

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

@@ -13,3 +13,4 @@ tmp/
 .DS_Store
 Gemfile-custom
 tags
+target

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

@@ -109,8 +109,9 @@ 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
+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/datomic/m2_settings.xml.tt

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
+  <servers>
+    <server>
+      <id>my.datomic.com</id>
+      <username><%= config[:datomic_username] %></username>
+      <password><%= config[:datomic_key] %></password>
+    </server>
+  </servers>
+</settings>

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

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.xnlogic</groupId>
+  <artifactId>pro</artifactId>
+  <name>pro</name>
+  <packaging>jar</packaging>
+  <version>0.0.0</version>
+  <repositories>
+    <repository>
+      <id>my.datomic.com</id>
+      <url>https://my.datomic.com/repo</url>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
+    </repository>
+  </repositories>
+  <dependencies>
+    <dependency>
+      <groupId>com.datomic</groupId>
+      <artifactId>datomic-pro</artifactId>
+      <version><%= config[:datomic_version] || config[:default_datomic_version] %></version>
+    </dependency>
+  </dependencies>
+</project>

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

@@ -0,0 +1,10 @@
+#! /bin/sh
+
+
+cd $HOME/$XN_CLIENT/config
+mkdir -p $HOME/.m2
+cp m2_settings.xml $HOME/.m2/settings.xml
+mvn package
+cd -
+
+

data/lib/xnlogic/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xnlogic
 version: !ruby/object:Gem::Version
-  version: 1.0.38
+  version: 1.0.39
 platform: ruby
 authors:
 - Darrick Wiebe
@@ -131,7 +131,6 @@ files:
 - lib/xnlogic/templates/application/tasks/deploy.rb.tt
 - lib/xnlogic/templates/application/torquebox.yml.tt
 - lib/xnlogic/templates/application/torquebox_init.rb.tt
-- lib/xnlogic/templates/deploy/nginx.conf.tt
 - lib/xnlogic/templates/deploy/server_profiles/profile.rb.tt
 - lib/xnlogic/templates/vagrant/Gemfile.tt
 - lib/xnlogic/templates/vagrant/Vagrantfile.tt
@@ -140,6 +139,9 @@ files:
 - lib/xnlogic/templates/vagrant/config/transactor.properties
 - lib/xnlogic/templates/vagrant/config/vagrant.provision.tt
 - lib/xnlogic/templates/vagrant/config/xnlogic.conf.tt
+- lib/xnlogic/templates/vagrant/datomic/m2_settings.xml.tt
+- lib/xnlogic/templates/vagrant/datomic/pom.xml.tt
+- lib/xnlogic/templates/vagrant/datomic/update_datomic.sh.tt
 - lib/xnlogic/ui.rb
 - lib/xnlogic/ui/shell.rb
 - lib/xnlogic/ui/silent.rb