xnlogic 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53c0bbebd47061647f31daa55f97fcb6d509ce8c
-  data.tar.gz: 6e960006fe662c8a6d01e9dffee51ea5c7fad708
+  metadata.gz: bf6642954f98a009ba85907406706b15f4fb876b
+  data.tar.gz: 642836230ed76d0801fd742d68c068ab3e02a86a
 SHA512:
-  metadata.gz: a29d09df746a5d75d8ac812f68caa16544bf9ae3c774f1a6c9fa4802c0cccb1f0085de581c2e9e89249f275b8bc77515e3aa7adfcc6bcf6a824e6ba0444b50f8
-  data.tar.gz: ea0de41a5976d02531402b2525fe98ebf6c5c4e7be4e600f7acf63967fa320c512c3b6cf0513679526828498c59e4c510652ec0e745cfb7b3bc6717b054e1ec3
+  metadata.gz: a3851f5264bfedb9878e087e0bc027ebb20d7ab9a3bc7bf701840b8c7ac25ffe4e3c09f19612123537a237b15604945a2649e67e5c77d41007a26d674cc9e8a0
+  data.tar.gz: e1375b82416106fee57cb156e69505323d084a4df7b5eff88f1201c61f2fa547cd5a2c93277c94bcf72824c84d0f2a268045adea0c78cc8a78c3c027d455d09e

data/lib/xnlogic/cli/application.rb

@@ -27,6 +27,8 @@ module Xnlogic
         :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'],
       }
 
       base_templates = {

data/lib/xnlogic/cli.rb

@@ -27,8 +27,8 @@ module Xnlogic
     # is useful if you have a task that can receive arbitrary additional options, and where those additional options should not be handled by Thor.
     stop_on_unknown_option! :exec
 
-    class_option "no-color", :type => :boolean, :banner => "Disable colorization in output"
-    class_option "verbose",  :type => :boolean, :banner => "Enable verbose output mode", :aliases => "-V"
+    class_option "color", :type => :boolean, default: true, :banner => "Enable colorization in output"
+    class_option "verbose",  :type => :boolean, :banner => "Enable verbose output mode"
 
     def help(cli = nil)
       case cli
@@ -54,8 +54,12 @@ module Xnlogic
     end
 
     desc "application NAME [OPTIONS]", "Creates a skeleton of an XN Logic application"
-    option "base", type: :string, default: 'xnlogic', banner:
+    method_option "base", type: :string, default: 'xnlogic', 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)"
     def application(name)
       require 'xnlogic/cli/application'
       Application.new(options, name, self).run

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

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

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

@@ -120,7 +120,15 @@ rake --quiet new_tb_version bundle_fe_server fresh_fe_config fe_server_db_init
 
 hr
 echo "Starting Datomic"
+hr
+cd $HOME
+wget https://www.dropbox.com/s/07wwxn8mbujxugb/datomic-free-0.9.4699.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 cp $HOME/xn.dev/config/etc_init_datomic.conf /etc/init/datomic.conf
+sudo mkdir -p /etc/datomic
+sudo cp $HOME/xn.dev/config/transactor.properties /etc/datomic/transactor.properties
 sudo initctl reload-configuration
 sudo start datomic
 

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

@@ -4,5 +4,5 @@ XN_CLIENT: '<%= config[:name] %>'
 timezone: 'America/Toronto'
 jruby_version: '1.7.16'
 DATOMIC_VERSION: '0.9.4755'
-vm_memory: '2048'
-vm_cpus: '2'
+vm_memory: '<%= config[:vm_memory] %>'
+vm_cpus: '<%= config[:vm_cpus] %>'

data/lib/xnlogic/ui/shell.rb

@@ -6,7 +6,8 @@ module Xnlogic
       attr_writer :shell
 
       def initialize(options = {})
-        if options["no-color"] || !STDOUT.tty?
+        if options["color"] == false || !STDOUT.tty?
+          # FIXME: Apparently the basic shell now does color
           Thor::Base.shell = Thor::Shell::Basic
         end
         @shell = Thor::Base.shell.new

data/lib/xnlogic/version.rb

@@ -1,3 +1,3 @@
 module Xnlogic
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xnlogic
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Darrick Wiebe