xnlogic 1.0.45 → 1.0.46

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84b5eb356eaddf722ef1cce1d851f7c892f35561
-  data.tar.gz: 6da713831743b875aea35e9673f3d1e447059c4a
+  metadata.gz: 47dc1c3cae6aff7bd8bc5e8cd27f20d2cae72964
+  data.tar.gz: 44c2835774b5b681349c3c76fe5877a11c62943d
 SHA512:
-  metadata.gz: 18c936bf236327c779fbd209c86f932f05869e6a3fa8ef797c0a536e0f8e0c456dd5f12fa70ffef4ee6cb18228e16e4826a7d68996b9769048bef2a39e28c0d8
-  data.tar.gz: b743bcb856da2b4dc7bd24a362b4e58e869050f98d6892ec28ccf3001431304e36413ce36febdf9e511fa0132727dbf682ad62bd19a98ac3660c501ed66975d6
+  metadata.gz: 2b9f6a6179c9ded86c855575caa0d2a1ccb40d32184b76bac9c7e141adc9e94ec4b3c992173b078813754f113c0f360295e800450a19dd9bd4c7b764a8fc2032
+  data.tar.gz: 46c110fcd9429e00fbbadd1d3b0e520be8f257c713f72b5dfa73aa8193da14a2d7561295c73f1be465658a7662d90482f43f42e99fec6bd4f04be5d6d2505bbd

data/lib/xnlogic/cli/application.rb

@@ -182,6 +182,7 @@ module Xnlogic
         :datomic_mysql            => options['datomic_mysql'],
         :datomic_optional_version => options['datomic_version'],
         :datomic_version          => (options['datomic_version'] || "0.9.5130"),
+        :mysql_version            => '5.1.35',
         :datomic_username         => options.fetch('datomic_username', '[username from my.datomic.com]'),
         :datomic_key              => options.fetch('datomic_key', '[key from my.datomic.com]'),
       }
@@ -221,6 +222,7 @@ module Xnlogic
         "config/vagrant.up.tt" => "config/vagrant.up",
         "config/datomic.conf" => "config/datomic.conf",
         "config/start.sh" => "config/start.sh",
+        "config/diagnostics.sh" => "config/diagnostics.sh",
         transactor_properties => "config/transactor.properties",
         "config/xnlogic.conf.tt" => "config/xnlogic.conf",
         datomic_installer => 'script/install_transactor.sh',

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

@@ -16,6 +16,10 @@ require 'active_support/core_ext'
 require 'pacer'
 require 'pacer-model'
 require 'pathname'
+<% if config[:datomic_mysql] -%>
+require 'pacer-mcfly-mysql'
+#require 'mysql-connector-java-<%=config[:mysql_version]%>-bin.jar'
+<% end -%>
 
 require '<%= config[:namespaced_path] %>/initializers/inflections'
 

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

@@ -1,13 +1,15 @@
 # Some of our part/model names aren't inflected correctly by default.
 # Here we exclude them:
 ActiveSupport::Inflector.inflections do |inflect|
-  inflect.uncountable "media"
   inflect.uncountable "software"
 
-  inflect.irregular "vrf", "vrfs"
+  inflect.irregular "genus", "genera"
+
+  # Singular definition is rarely needed, except when a singular word naively
+  # looks like it may be plural.
+  inflect.singular "genus", "genus"
 
   inflect.acronym 'DNS'
-  inflect.acronym 'FEX'
   inflect.acronym 'GW'
   inflect.acronym 'GWs'
 end

data/lib/xnlogic/templates/vagrant/config/diagnostics.sh

@@ -0,0 +1,42 @@
+#! /bin/bash
+
+TS=$(date +%s)
+DIR=$HOME/diagnostics/$TS
+mkdir -p $DIR/{etc,log,dotfiles}
+mkdir -p $DIR/$XN_CLIENT/lib
+
+which tree || sudo apt-get install tree
+
+sudo netstat -lt
+sudo netstat -lt > $DIR/netstat.txt
+tree $XN_CLIENT > $DIR/tree-${XN_CLIENT}.txt
+tree $HOME/.m2 > $DIR/tree-m2.txt
+tree $HOME/.npm > $DIR/tree-npm.txt
+tree /etc/{init,init.d} > $DIR/tree-init.txt
+tree /opt/xn_apps > $DIR/tree-xn_apps.txt
+which ruby > $DIR/ruby-version.txt
+ruby -v >> $DIR/ruby-version.txt
+rvm list 2>&1 >> $DIR/ruby-version.txt
+
+cp -r $HOME/$XN_CLIENT/{config,script,Gemfile.lock,Jarfile.lock,${XN_CLIENT}.gemspec,torquebox.yml,torquebox_init.rb,Vagrantfile,config.ru,.gitignore} $DIR/$XN_CLIENT/lib
+cp $HOME/$XN_CLIENT/lib/${XN_CLIENT}.rb $DIR/lib
+cp $HOME/{.bash_logout,.bash_profile,.bashrc,.curlrc,.gemrc,.gitconfig,.irb-history,.mkshrc,.profile,.zlogin,.zsh_history,.zshrc} $DIR/dotfiles
+sudo cp -r /etc/{datomic,mysql} $DIR/etc
+mkdir -p $DIR/etc/init
+sudo cp  /etc/init/{datomic,mysql}.conf $DIR/etc/init
+
+sudo cp /var/log/datomic.log $DIR/log
+mkdir -p $DIR/log/datomic
+sudo cp /opt/datomic/current/log/$(date +%Y-%m-%d).log $DIR/log/datomic
+cp $HOME/xn.dev/tmp/server.log $DIR/log
+sudo cp -r /var/log/mysql $DIR/log
+
+sudo chown -R $(whoami):$(whoami) $DIR
+cd $DIR
+tar -czvf $HOME/${XN_CLIENT}-diagnostics-${TS}.tgz .
+cd -
+
+rm -r $DIR
+
+echo
+echo Diagnostics file created at: \~/${XN_CLIENT}-diagnostics-${TS}.tgz

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

@@ -27,6 +27,7 @@ export LC_ALL=en_US.UTF-8
 
 # make jruby processes boot faster
 export JRUBY_OPTS=--dev
+silent sudo apt-get update
 
 hr
 echo "Setting timezone:"

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

@@ -23,3 +23,5 @@ if [ $? -ne 0 ]; then
   >&2 echo "Failed to get Datomic dependency. Run $HOME/$XN_CLIENT/script/get_datomic_jar.sh for details."
 fi
 <% end -%>
+
+npm install -g xn-cli

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

@@ -2,25 +2,25 @@
 
 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
+wget -nv --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 -o datomic.zip
 rm datomic.zip
 sudo mkdir -p /opt/datomic
-sudo chown vagrant:vagrant /opt/datomic
 sudo rm -r /opt/datomic/datomic-pro-<%=config[:datomic_version]%>
 sudo 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
+  wget -nv http://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-java-<%=config[:mysql_version]%>.tar.gz -O mysql.tgz
   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
+  cp mysql-connector-java-<%=config[:mysql_version]%>/mysql-connector-java-<%=config[:mysql_version]%>-bin.jar <%=config[:name]%>/lib
+  sudo mv mysql-connector-java-<%=config[:mysql_version]%>/mysql-connector-java-<%=config[:mysql_version]%>-bin.jar /opt/datomic/current/lib
+  rm -r mysql-connector-java-<%=config[:mysql_version]%>
   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 rm /opt/datomic/current
+sudo ln -s /opt/datomic/datomic-pro-<%=config[:datomic_version]%> /opt/datomic/current
 sudo service datomic start
 cd -

data/lib/xnlogic/version.rb

@@ -1,3 +1,3 @@
 module Xnlogic
-  VERSION = "1.0.45"
+  VERSION = "1.0.46"
 end

metadata

@@ -1,86 +1,72 @@
 --- !ruby/object:Gem::Specification
 name: xnlogic
 version: !ruby/object:Gem::Version
-  version: 1.0.45
+  version: 1.0.46
 platform: ruby
 authors:
 - Darrick Wiebe
 - David Colebatch
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-04-14 00:00:00.000000000 Z
+date: 2015-04-27 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
@@ -137,6 +123,7 @@ files:
 - lib/xnlogic/templates/vagrant/Gemfile.tt
 - 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/start.sh
 - lib/xnlogic/templates/vagrant/config/vagrant.provision.tt
 - lib/xnlogic/templates/vagrant/config/vagrant.up.tt
@@ -162,24 +149,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: []