xnlogic 1.0.11 → 1.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6256cedda87c693917dc449a14c9a2a93c8d4e1
-  data.tar.gz: c486a2097064ce59d425d6af197b0379542a512c
+  metadata.gz: 0ff9ac3730febdacf1ea97fc3b31aca65989c8bc
+  data.tar.gz: cea5c7cbc7072c694abe5004dd551d4f9ebf05a8
 SHA512:
-  metadata.gz: 3c0fb0eda7440d56865936a4ec09293f3aa59438e941ed4dff28faf72d735b47a7e8a399de498a5482c0fa4d3ee119d0382cf88c3da08e83463bc392129ca70b
-  data.tar.gz: bb8d9150ef5829767bb35a710850848526d9d635e60171e0061a8592a3fce1bd559903d1be98c87f8e9180df40c7bacbc68f799e42b1ba30b60cf4abf359e92d
+  metadata.gz: 480520f7a0331a2d11c154a95809e6a6e74a14ba73957747ec4008dc8283388ac98d0a9f91f1eea6ae5721a47afaa33553ef9addc6cc56b8741bd270ce082025
+  data.tar.gz: 3a49ba51595c08e4c33d1471adc4f505ddc99e881dfb982ed3a396fa8f49ee982ec930167c430a4658598bf37858b32ccd38ff31d971816cd210fa8077e0bcea

data/lib/xnlogic/cli/application.rb

@@ -34,7 +34,6 @@ module Xnlogic
       base_templates = {
         "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",
       }
@@ -46,6 +45,7 @@ module Xnlogic
       templates = {
         "gitignore.tt" => ".gitignore",
         ".rspec.tt" => ".rspec",
+        "gemspec.tt" => "#{namespaced_path}.gemspec",
         "Gemfile.tt" => "Gemfile",
         "Readme.md.tt" => "Readme.md",
         "config.ru.tt" => "config.ru",

data/lib/xnlogic/cli.rb

@@ -54,14 +54,14 @@ module Xnlogic
     end
 
     desc "application NAME [OPTIONS]", "Creates a skeleton of an XN Logic application"
-    method_option "cpus", type: :numeric, default: 2, banner:
-      "Number of Virtual CPUs the Development VM should use"
-    method_option "memory", type: :numeric, default: 2048, banner:
-      "Amount of RAM to allow the Development VM to use (in MB)"
     method_option "key", type: :string, banner:
       "You must supply an XN key to be able to download the proprietary dependencies needed to boot your application"
     method_option "root", type: :string, banner:
       "Optionally specify a different root directory name"
+    method_option "cpus", type: :numeric, banner:
+      "Number of Virtual CPUs the Development VM should use"
+    method_option "memory", type: :numeric, banner:
+      "Amount of RAM to allow the Development VM to use (in MB)"
     def application(name)
       require 'xnlogic/cli/application'
       Application.new(options, name, self).run

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

@@ -1,17 +1,4 @@
-source "http://rubygems.org"
-source "http://<%= config[:xn_key] || 'xn:key_required' %>@pacer-model.xnlogic.net
-source "http://<%= config[:xn_key] || 'xn:key_required' %>@pacer-mcfly.xnlogic.net
+source "https://<%= config[:xn_key] || 'xn:key_required' %>@gems.xnlogic.com"
+source "https://rubygems.org/"
 
-gem 'torquebox',      '3.1.1'
-gem 'rack',           '1.5.2'
-gem 'jruby-openssl',  '0.9.5'
-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
+gemspec

data/lib/xnlogic/templates/application/config.ru.tt

@@ -1,5 +1,4 @@
 begin
-  require 'pacer-model-compiled'
   require 'pacer-model'
   require '<%= config[:namespaced_path] %>'
   logger = TorqueBox::Logger.new("XN")

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

@@ -0,0 +1,35 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "<%= config[:namespaced_path] %>/version"
+
+Gem::Specification.new do |s|
+  s.name        = "<%= config[:name] %>"
+  s.version     = <%= config[:constant_name] %>::VERSION
+  s.platform    = 'java'
+  s.authors     = ["Darrick Wiebe", "David Colebatch"]
+  s.email       = ["dw@xnlogic.com", "dc@xnlogic.com"]
+  s.homepage    = "http://xnlogic.com"
+  s.summary     = %q{<%= config[:constant_name] %> application on XN Logic}
+  s.description = %q{TODO: that is up to you!}
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.require_paths = ["lib"]
+
+  s.add_dependency 'rack', '1.5.2'
+  s.add_dependency 'pacer', '>= 2.0.6'
+  s.add_dependency 'pacer-model'
+  s.add_dependency 'pacer-neo4j'
+  s.add_dependency 'pacer-mcfly'
+
+  s.add_dependency 'jruby-openssl', '0.9.6'
+
+  s.add_dependency 'torquebox', '3.1.1'
+  s.add_dependency 'torquebox-messaging', '3.1.1'
+
+  s.add_development_dependency 'rspec-core', '~>2.13.0'
+  s.add_development_dependency 'rspec-expectations'
+  s.add_development_dependency 'rr'
+  s.add_development_dependency 'autotest-standalone'
+  s.add_development_dependency 'awesome_print', '0.4.0'
+end

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

@@ -12,8 +12,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # 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']
+  app_name = '<%= config[:name] %>'
 
   # Every Vagrant virtual environment requires a box to build off of.
   config.vm.box = "box-cutter/ubuntu1404"
@@ -24,9 +23,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.network "forwarded_port", guest: 8080, host: 8080
   config.vm.network "forwarded_port", guest: 3030, host: 3030
   config.vm.network "forwarded_port", guest: 3031, host: 3031
-  config.vm.network "forwarded_port", guest: 4334, host: 4334
-  config.vm.network "forwarded_port", guest: 4335, host: 4335
-  config.vm.network "forwarded_port", guest: 4336, host: 4336
 
   # Create a private network, which allows host-only access to the machine
   # using a specific IP.
@@ -40,8 +36,11 @@ 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 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"
+  if nfs_setting
+    config.vm.synced_folder Dir.pwd, "/home/vagrant/" + app_name, create: true, id: app_name, :nfs => true, :mount_options => ['nolock,vers=3,udp']
+  else
+    config.vm.synced_folder Dir.pwd, "/home/vagrant/" + app_name, create: true, id: app_name
+  end
   
   # Allow caching to be used (see the vagrant-cachier plugin)
   if Vagrant.has_plugin?("vagrant-cachier")
@@ -62,29 +61,35 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.provider "virtualbox" do |vb|
     # boot with headless mode
     vb.gui = false
-    vb.customize ["modifyvm", :id, "--memory", settings['vm_memory']]
-    vb.customize ["modifyvm", :id, "--cpus", settings['vm_cpus']]
+    <% if config[:vm_memory] -%>
+    vb.customize ["modifyvm", :id, "--memory", '<%= config[:vm_memory] %>']
+    <% else -%>
+    #vb.customize ["modifyvm", :id, "--memory", '2048']
+    <% end -%>
+    <% if config[:vm_cpus] -%>
+    vb.customize ["modifyvm", :id, "--cpus", <%= config[:vm_cpus] %>]
+    <% else -%>
+    #vb.customize ["modifyvm", :id, "--cpus", 2]
+    <% end -%>
   end
 
   config.vm.provider "vmware_fusion" do |vmwf|
     # boot with headless mode
     vmwf.gui = false                
-    vmwf.vmx["memsize"] = settings['vm_memory']
-    vmwf.vmx["numvcpus"] = settings['vm_cpus']
+    <% if config[:vm_memory] -%>
+    vmwf.vmx["memsize"] = '<%= config[:vm_memory] %>MB'
+    <% else -%>
+    #vmwf.vmx["memsize"] = '2048MB'
+    <% end -%>
+    <% if config[:vm_cpus] -%>
+    vmwf.vmx["numvcpus"] = <%= config[:vm_cpus] %>
+    <% else -%>
+    #vmwf.vmx["numvcpus"] = 2
+    <% end -%>
   end
 
-  p1 = settings['jruby_version']
-  p2 = settings['timezone']
-  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,app_name,p4,p5,p6,p7,p8]
     s.privileged = false
   end
 end

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

@@ -2,23 +2,10 @@
 
 echo "Configuring XN VM. This process will take several minutes."
 
-if [ -z "$1" ]; then echo "jruby_version not set" && exit 1; else echo "jruby_version is set to $1"; fi
-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
+jruby_version=1.7.18
+timezone="America/Toronto"
 
 silent() {
   if [[ $debug ]] ; then
@@ -34,14 +21,17 @@ printf "%$(tput cols)s\n"|tr " " "-"
 hr
 echo "Configuring environment"
 hr
-export XN_CLIENT=$3
-export DATOMIC_VERSION=$4
+export XN_CLIENT=<%= config[:name] %>
+export DATOMIC_VERSION=0.9.4755
 export DEBIAN_FRONTEND=noninteractive
 export LANG=en_US.UTF-8
 export LC_ALL=en_US.UTF-8
 sudo locale-gen en_US.UTF-8
 #sudo dpkg-reconfigure locales
 
+# make jruby processes boot faster
+export JRUBY_OPTS=--dev
+
 hr
 echo "Setting timezone:"
 echo "$timezone" | sudo tee /etc/timezone
@@ -89,6 +79,9 @@ hr
 echo "Updating 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
+echo "alias gs='git status'" >> ~/.zshrc
+echo "alias gd='git diff -w'" >> ~/.zshrc
+echo "alias gdc='git diff -w --cached'" >> ~/.zshrc
 
 hr
 echo "Installing Lein"
@@ -111,16 +104,15 @@ gem install --quiet torquebox-server -v '3.1.1'
 hr
 echo "Configuring XN gems"
 hr
-gem sources --add http://<%= config[:xn_key] || 'xn:key_required' %>@pacer-model.xnlogic.net
-gem sources --add http://<%= config[:xn_key] || 'xn:key_required' %>@pacer-mcfly.xnlogic.net
-gem install --quiet pacer-mcfly pacer-model
+gem sources --add https://<%= config[:xn_key] || 'xn:key_required' %>@gems.xnlogic.com/
 
 hr
 echo "Configuring XN"
 sudo mkdir -p /opt/xn_apps
 sudo chown vagrant /opt/xn_apps
 cd
-wget https://www.dropbox.com/s/qs1n0c6tig2jfwo/xn.dev.2.tbz -O $HOME/xn.dev.tbz --quiet
+
+wget https://www.dropbox.com/s/0aqqn94g35ruh9k/xn.dev.3.tbz -O $HOME/xn.dev.tbz --quiet
 tar -xjf xn.dev.tbz
 rm xn.dev.tbz
 cd xn.dev
@@ -131,14 +123,24 @@ sudo npm install --loglevel silent
 cd -
 rake --quiet new_tb_version bundle_fe_server fresh_fe_config fe_server_db_init
 
+if [ -d $HOME/$XN_CLIENT/assets ]; then
+  hr
+  echo "Configuring Assets"
+  silent sudo chown -R vagrant:vagrant $HOME
+  chown -R vagrant:vagrant $HOME
+  cd $HOME/$XN_CLIENT/assets
+  bundle install
+  npm install
+fi
+
 hr
 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
+wget https://www.dropbox.com/s/2sxd5gqmai58xnl/datomic-free-0.9.4755.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 mv datomic-free-0.9.4755 /usr/local/lib/datomic
 sudo cp /vagrant/config/datomic.conf /etc/init/datomic.conf
 sudo mkdir -p /etc/datomic
 sudo ln -s /vagrant/config/transactor.properties /etc/datomic/transactor.properties
@@ -146,16 +148,17 @@ sudo initctl reload-configuration
 sudo start datomic
 
 hr
-echo "Customizing .zshrc for <%= config[:name] %> development"
-echo "export XN_CLIENT=<%= config[:name] %>" >> ~/.zshrc
+echo "Customizing .zshrc for $XN_CLIENT development"
+echo "export XN_CLIENT=$XN_CLIENT" >> ~/.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 lib -r dev/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; JRUBY_OPTS=--dev source script/setup_stack)' >> ~/.zshrc
+echo 'JRUBY_OPTS=--dev source $HOME/xn.dev/script/setup_stack' >> ~/.zshrc
+
 
 hr
-echo "Configuring <%= config[:name] %>"
-cd $HOME/<%= config[:name] %>
+echo "Configuring $XN_CLIENT"
+cd $HOME/$XN_CLIENT
 bundle
 torquebox deploy
 hr

data/lib/xnlogic/version.rb

@@ -1,3 +1,3 @@
 module Xnlogic
-  VERSION = "1.0.11"
+  VERSION = "1.0.12"
 end

metadata

@@ -1,85 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: xnlogic
 version: !ruby/object:Gem::Version
-  version: 1.0.11
+  version: 1.0.12
 platform: ruby
 authors:
 - Darrick Wiebe
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-01-09 00:00:00.000000000 Z
+date: 2015-01-14 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: Build graph applications with XN Logic.
 email:
 - dw@xnlogic.com
@@ -88,7 +74,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
 - Gemfile
 - README.md
 - Rakefile
@@ -104,6 +90,7 @@ files:
 - lib/xnlogic/templates/application/Readme.md.tt
 - lib/xnlogic/templates/application/config.ru.tt
 - lib/xnlogic/templates/application/dev/console.rb.tt
+- lib/xnlogic/templates/application/gemspec.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
@@ -124,7 +111,6 @@ files:
 - 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
 - lib/xnlogic/ui/shell.rb
 - lib/xnlogic/ui/silent.rb
@@ -134,24 +120,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.2.2
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.4.5
+signing_key:
 specification_version: 4
 summary: XN Logic command-line tools
 test_files: []

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

@@ -1,8 +0,0 @@
----
-
-XN_CLIENT:        '<%= config[:name] %>'
-timezone:         'America/Toronto'
-jruby_version:    '1.7.18'
-DATOMIC_VERSION:  '0.9.4755'
-vm_memory:        '<%= config[:vm_memory] %>'
-vm_cpus:          '<%= config[:vm_cpus] %>'