xnlogic 1.0.10 → 1.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aeb6afcb2bb7467ea0479d10b2a16c1700ae3539
-  data.tar.gz: a41a035c7ac0b516c78b35a807255f9acd68ed55
+  metadata.gz: a6256cedda87c693917dc449a14c9a2a93c8d4e1
+  data.tar.gz: c486a2097064ce59d425d6af197b0379542a512c
 SHA512:
-  metadata.gz: c23f87ab7dec20279082d7aeba264b5c1e8140af0a4d8320acc28e08ec3aae92fc7799c3526a3081aa0ec0208d814f86509e97230f2b0d104d4ffe8b97a153f0
-  data.tar.gz: 8db65b28c367c9196119228f5e4f5f0f07dc283003e976a95a80765244507dbe0b537c7a9361ee2f8d5a1663711fe868e3649b33663fd25646ba944b12f9a981
+  metadata.gz: 3c0fb0eda7440d56865936a4ec09293f3aa59438e941ed4dff28faf72d735b47a7e8a399de498a5482c0fa4d3ee119d0382cf88c3da08e83463bc392129ca70b
+  data.tar.gz: bb8d9150ef5829767bb35a710850848526d9d635e60171e0061a8592a3fce1bd559903d1be98c87f8e9180df40c7bacbc68f799e42b1ba30b60cf4abf359e92d

data/lib/xnlogic/cli/application.rb

@@ -2,7 +2,7 @@ require 'pathname'
 
 module Xnlogic
   class CLI::Application
-    attr_reader :options, :app_name, :thor, :base_name, :name, :app
+    attr_reader :options, :app_name, :thor, :base_name, :name, :app, :root
 
     def initialize(options, app_name, thor)
       @options = options
@@ -10,7 +10,8 @@ module Xnlogic
       @thor = thor
 
       @name = app_name.chomp("/").tr('-', '_') # remove trailing slash if present
-      @app = Pathname.pwd.join(name)
+      @root = options.fetch('root', @name)
+      @app = Pathname.pwd.join(root)
     end
 
     def run
@@ -27,6 +28,7 @@ module Xnlogic
         :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'],
       }
 
       base_templates = {
@@ -83,7 +85,7 @@ module Xnlogic
       Xnlogic.ui.info ""
       Xnlogic.ui.info "Then run the following:"
       Xnlogic.ui.info ""
-      Xnlogic.ui.info "cd #{name}"
+      Xnlogic.ui.info "cd #{root}"
       Xnlogic.ui.info "vagrant up"
       Xnlogic.ui.info "vagrant ssh"
       Xnlogic.ui.info ""

data/lib/xnlogic/cli.rb

@@ -54,12 +54,14 @@ module Xnlogic
     end
 
     desc "application NAME [OPTIONS]", "Creates a skeleton of an XN Logic application"
-    method_option "base", type: :string, banner:
-      "The project is structured ./base_directory/application_directory. Name the base_directory"
     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"
     def application(name)
       require 'xnlogic/cli/application'
       Application.new(options, name, self).run

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

@@ -1,4 +1,6 @@
 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
 
 gem 'torquebox',      '3.1.1'
 gem 'rack',           '1.5.2'

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

@@ -72,6 +72,7 @@ hr
 echo "Installing JRuby"
 silent rvm mount -r https://s3.amazonaws.com/jruby.org/downloads/${jruby_version}/jruby-bin-${jruby_version}.tar.gz --verify-downloads 1
 rvm use jruby-${jruby_version} --default
+gem update --system
 gem source -a https://rubygems.org
 gem source -r http://rubygems.org/
 
@@ -108,12 +109,11 @@ hr
 gem install --quiet torquebox-server -v '3.1.1'
 
 hr
-echo "Installing XN gems"
+echo "Configuring XN gems"
 hr
-wget https://www.dropbox.com/s/$mcfly_key/pacer-mcfly-$mcfly_version-java.gem -O pacer-mcfly-$mcfly_version-java.gem --quiet
-wget https://www.dropbox.com/s/$pm_key/pacer-model-$pm_version-java.gem -O pacer-model-$pm_version-java.gem --quiet
-gem install --quiet pacer-mcfly-$mcfly_version-java.gem pacer-model-$pm_version-java.gem
-rm pacer-mcfly-$mcfly_version-java.gem pacer-model-$pm_version-java.gem
+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
 
 hr
 echo "Configuring XN"
@@ -125,6 +125,7 @@ tar -xjf xn.dev.tbz
 rm xn.dev.tbz
 cd xn.dev
 source script/setup_stack
+echo jruby-${jruby_version} > .ruby-version
 cd fe/xn.js
 sudo npm install --loglevel silent
 cd -
@@ -147,10 +148,10 @@ sudo start datomic
 hr
 echo "Customizing .zshrc for <%= config[:name] %> development"
 echo "export XN_CLIENT=<%= config[:name] %>" >> ~/.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 $HOME/$XN_CLIENT/lib -r $HOME/$XN_CLIENT/dev/console)"' >> ~/.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; source script/setup_stack)' >> ~/.zshrc
+echo '(cd $HOME/xn.dev; JRUBY_OPTS=--dev source script/setup_stack)' >> ~/.zshrc
 
 hr
 echo "Configuring <%= config[:name] %>"

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

@@ -2,11 +2,7 @@
 
 XN_CLIENT:        '<%= config[:name] %>'
 timezone:         'America/Toronto'
-jruby_version:    '1.7.16'
+jruby_version:    '1.7.18'
 DATOMIC_VERSION:  '0.9.4755'
 vm_memory:        '<%= config[:vm_memory] %>'
 vm_cpus:          '<%= config[:vm_cpus] %>'
-mcfly_version:    '0.7.2.pre'
-mcfly_key:        '...'
-pm_version:       '0.6.3.pre'
-pm_key:           '...'

data/lib/xnlogic/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xnlogic
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.0.11
 platform: ruby
 authors:
 - Darrick Wiebe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-08 00:00:00.000000000 Z
+date: 2015-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -150,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: XN Logic command-line tools