xnlogic 1.0.40 → 1.0.41

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3536880927910f75a9baed65b5c2f4decd31a29
-  data.tar.gz: 6bc3eeccae6bc2d897b85ad0b5bfe97de2880c1b
+  metadata.gz: 02df4d7538957ec9c6e46168115b839087ae5001
+  data.tar.gz: 9bfda18788a609ea4ef566f445728aa26501a9b7
 SHA512:
-  metadata.gz: a1c1f2be3dffaa49f778ff4aff3706aa9c6af90a99f68f31cccb80d7a71ed03ae45353fcf90c4469dffbec4f3e8bad3de9821aea91651b901333004fb11b60f2
-  data.tar.gz: e7d9e373bed6eb283d483c9c13f3d2e22368a941afa109e333bd8160fd400a3d49feaf6590d57cbffbd301faa2976a7ab3aaecbdab858713451c0ab2795f8e11
+  metadata.gz: a5ec522bc8fad50dfc791c8048cc0d58af039b3eb892e0910012fb61e09087a3fbc2eee9c1f3b83cb2ae4043343b90681bd3bf66ea73a97a3f901d6389604df7
+  data.tar.gz: e4fceb73a3f926c6d662b1ee088cb692c58c1f6f1431cbc68097d894f8e28cf88814b834ab1d6b85bc9dcb7d4627bc0303b4f6292687c14cff00e6bea94eceb7

data/lib/xnlogic/cli/application.rb

@@ -230,6 +230,11 @@ module Xnlogic
         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'
+        if options['datomic_mysql']
+          base_templates['datomic/mysql/db.sql'] = 'config/mysql/db.sql'
+          base_templates['datomic/mysql/table.sql'] = 'config/mysql/table.sql'
+          base_templates['datomic/mysql/user.sql'] = 'config/mysql/user.sql'
+        end
       end
 
       _generate_templates(base_templates, 'vagrant', template_options, 'Creating Vagrant configuration')

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

@@ -107,8 +107,8 @@ git config --global --add alias.ignore "update-index --assume-unchanged"
 git config --global --add alias.unignore "update-index --no-assume-unchanged"
 git config --global --add alias.cp "cherry-pick"
 git config --global --add alias.unadd "reset HEAD"
-git config --global --add alias.lg "log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit"
-git config --global --add alias.lga "log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --all"
+git config --global --add alias.lg "log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)[%an]%Creset' --abbrev-commit"
+git config --global --add alias.lga "lg --all"
 git config --global --add alias.branches "submodule foreach 'git branch | grep \*'"
 
 hr
@@ -133,6 +133,26 @@ sudo rm -rf /etc/nginx/sites-enabled/default
 sudo cp $HOME/$XN_CLIENT/config/xnlogic.conf /etc/nginx/sites-enabled/xnlogic.conf
 sudo service nginx restart 
 
+<% if config[:datomic_pro] -%>
+hr
+echo "Upgrading to Datomic Pro transactor"
+chmod +x $HOME/$XN_CLIENT/script/install_transactor.sh
+$HOME/$XN_CLIENT/script/install_transactor.sh
+<% end -%>
+
+<% if config[:datomic_mysql] -%>
+hr
+echo "Installing and configuring MySQL"
+sudo debconf-set-selections <<< 'mysql-server mysql-server/root_password password password'
+sudo debconf-set-selections <<< 'mysql-server mysql-server/root_password_again password password'
+sudo apt-get install -y mysql-server
+cd $HOME/$XN_CLIENT
+mysql -uroot -ppassword < config/mysql/db.sql
+mysql -uroot -ppassword < config/mysql/user.sql
+mysql -uroot -ppassword datomic < config/mysql/table.sql
+cd -
+<% end -%>
+
 hr
 echo "Done!"
 echo "--------------------------------------------------------"

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

@@ -13,8 +13,9 @@ 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'
+  tar -xvzf mysql.tgz
   sudo mv mysql-connector-java-5.1.35/*.jar /opt/datomic/datomic-pro-<%=config[:datomic_version]%>/lib
+  rm -r mysql-connector-java-5.1.35
   rm mysql.tgz
 <% end -%>
 sudo service datomic stop

data/lib/xnlogic/templates/vagrant/datomic/mysql/db.sql

@@ -0,0 +1,11 @@
+-- NOTE: Datomic does not ship with a MySql driver. To use these scripts, you must
+-- download the driver from http://dev.mysql.com/downloads/connector/j/ and copy
+-- the jar file into the lib directory of the transactor so that it is available
+-- to the transactor. You must also ensure the jar is available on the classpath of
+-- your peer application.
+
+-- Database: datomic
+
+-- DROP DATABASE datomic;
+
+CREATE DATABASE datomic COLLATE 'binary';

data/lib/xnlogic/templates/vagrant/datomic/mysql/table.sql

@@ -0,0 +1,14 @@
+-- NOTE: see mysql-db.sql for instructions on installing mysql driver
+
+-- Table: datomic_kvs
+
+-- DROP TABLE datomic_kvs;
+
+CREATE TABLE datomic_kvs
+(
+ id varchar(640) NOT NULL,
+ rev integer,
+ map text,
+ val longblob,
+ CONSTRAINT pk_id PRIMARY KEY (id)
+) ENGINE=INNODB

data/lib/xnlogic/templates/vagrant/datomic/mysql/user.sql

@@ -0,0 +1,6 @@
+-- NOTE: see mysql-db.sql for instructions on installing mysql driver
+
+-- DROP USER datomic@localhost;
+
+GRANT ALL ON datomic.* TO datomic@localhost IDENTIFIED BY 'datomic';
+

data/lib/xnlogic/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xnlogic
 version: !ruby/object:Gem::Version
-  version: 1.0.40
+  version: 1.0.41
 platform: ruby
 authors:
 - Darrick Wiebe
@@ -145,6 +145,9 @@ files:
 - 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/mysql/db.sql
+- lib/xnlogic/templates/vagrant/datomic/mysql/table.sql
+- lib/xnlogic/templates/vagrant/datomic/mysql/user.sql
 - lib/xnlogic/templates/vagrant/datomic/pom.xml.tt
 - lib/xnlogic/templates/vagrant/datomic/pro.properties.tt
 - lib/xnlogic/ui.rb