xnlogic 1.0.37 → 1.0.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2871025510222de344c8728443c6e22a04bc83f
-  data.tar.gz: 98f3673a68284b3b2e272b7dbbaa863bb44157f0
+  metadata.gz: fc4111984be1fc417fe78986cb0517ec967814c8
+  data.tar.gz: e12af67f7dab1abbd3994e750356dfb4ca4176da
 SHA512:
-  metadata.gz: a4c3932601756b12bf90f1f69952d81c317f0189de3292169214a170e9e7c82318f5b4babfdb8f09d846eada80bcc2e43ca71864681d1ba5de111919da80da1e
-  data.tar.gz: 60867cabc047459b9b884adc179e58a6d548ef133f1aebcb6ee437c8d7eb3f2d4de4cd5eeaf24cb210e184a75cbbb5ed374be600d61bc77dfebed30540a962bc
+  metadata.gz: bef4cc70bc4d4c90edab266e1717a1cbb2479bba6d2a05d669574282e89a6fa103db27c8c7fefa4aef83b537f186c3e88e51fc34ed4866fd9c308f35a5ff46f6
+  data.tar.gz: 5077bd4e9979b37005a89b626f0f96253b660c160f425c6e09c5b2d46e9d4d7c7ade3ae16cf6973aa53bdf2791c14453e92735caaaf4ed47769bfb5b004d5800

data/lib/xnlogic/cli/application.rb

@@ -2,7 +2,7 @@ require 'xnlogic/cli/core'
 
 module Xnlogic
   class CLI::Application < CLI::Core
-    attr_reader :app_name, :base_name, :name, :root
+    attr_reader :app_name, :base_name, :name, :root, :existing
 
     def initialize(options, thor)
       super
@@ -30,6 +30,7 @@ module Xnlogic
     end
 
     def in_existing_project
+      @existing = true
       @root = options.fetch('root', '.')
       @app = Pathname.pwd.join(root)
       super()
@@ -62,7 +63,7 @@ module Xnlogic
       options['application_version'] = Xnlogic::VERSION
       write_options
       Xnlogic.ui.info "Initializing git repo in #{app}"
-      Dir.chdir(app) { system 'git init' and system 'git add .' }
+      Dir.chdir(app) { system 'git init' and system 'git add .' } unless existing
 
       install_vagrant_note
       if options['up']
@@ -195,6 +196,7 @@ module Xnlogic
         "logback.xml.tt" => "logback.xml",
         "config.ru.tt" => "config.ru",
         "dev/console.rb.tt" => "dev/console.rb",
+        "config/mcfly_config.yaml.tt" => "config/mcfly_config.yaml",
         "tasks/deploy.rb.tt" => "tasks/deploy.rb",
         "torquebox.yml.tt" => "torquebox.yml",
         "torquebox_init.rb.tt" => "torquebox_init.rb",

data/lib/xnlogic/templates/application/config/mcfly_config.yaml.tt

@@ -0,0 +1,59 @@
+---
+development:
+  protocol: free
+  peer:
+    # These settings will only be effective on first load. They will have no effect after datomic is started.
+    "datomic.objectCacheMax": '64m'
+
+production:
+  protocol: free
+  peer:
+    # These settings will only be effective on first load. They will have no effect after datomic is started.
+    "datomic.objectCacheMax": '512m'
+    # I am not certain that the memoryIndex* ones have any effect at all.
+    "datomic.memoryIndexMax":
+    "datomic.memoryIndexThreshold":
+
+sample_sql:
+  protocol: sql
+  engine: mysql
+  database: datomic
+  user: datomic
+  password: datomic
+  host:
+  port:
+
+sample_free:
+  protocol: free
+  host:
+  port:
+  h2port:
+  h2webport:
+
+sample_dev:
+  protocol: dev
+  host:
+
+sample_dynamo_db:
+  protocol: ddb
+  table: datomic
+  region: 
+  accesskeyid:
+  secretkey:
+
+sample_riak:
+  protocol: riak
+  bucket: datomic
+  interface: protobuf
+  host:
+  port:
+
+sample_couchbase:
+  protocol: couchbase
+  bucket: datomic
+  password:
+
+sample_infinispan:
+  protocol: inf
+  host:
+  port:

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

@@ -16,17 +16,18 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.require_paths = ["lib"]
 
+  # Prevent accidental public pushes (only enforced in Rubygems >= 2.4)
+  s.required_rubygems_version = '>= 2.2.0'
+  s.metadata['allowed_push_host'] = 'https://your.server.here'
+
   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'
-  # Prevent accidental public pushes (only enforced in Rubygems >= 2.4)
-  s.required_rubygems_version = '>= 2.2.0'
-  s.metadata['allowed_push_host'] = 'https://your.server.here'
+  s.add_dependency 'pacer-mcfly-free'
 
   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 'torquebox-remote-deployer', '0.1.1'

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

@@ -30,6 +30,14 @@ module <%= config[:constant_name] %>
       Pathname.new(File.expand_path(__FILE__)).parent
     end
 
+    def config_file(name)
+      lib_dir.parent + 'config' + name
+    end
+
+    def env
+      ENV['XN_ENV'] || 'development'
+    end
+
     def sample_app(args)
       unless args.is_a? Hash
         puts "sample_app takes an args hash with :graph and :client_name required."
@@ -84,6 +92,8 @@ end
 require '<%= config[:namespaced_path] %>/version'
 require '<%= config[:namespaced_path] %>/type'
 
+PacerModel.load_mcfly_config_yaml(<%= config[:constant_name] %>.config_file('mcfly_config.yaml'), <%= config[:constant_name] %>.env)
+
 PacerModel.applications['<%= config[:name] %>'] = <%= config[:constant_name] %>
 PacerModel.property_namespaces << <%= config[:constant_name] %>::Type::Property
 PacerModel.argument_namespaces << <%= config[:constant_name] %>::Type::Argument

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

@@ -19,7 +19,6 @@ printf "%$(tput cols)s\n"|tr " " "-"
 
 hr
 echo "Configuring environment"
-hr
 export XN_CLIENT=<%= config[:name] %>
 export DATOMIC_VERSION=0.9.4755
 export DEBIAN_FRONTEND=noninteractive
@@ -36,6 +35,9 @@ silent sudo dpkg-reconfigure --frontend noninteractive tzdata
 hr
 echo "Configuring XN gems"
 hr
+## We need to stick to 1.7.11 in order to be able bundle a new XN app (xnlogic dependency)
+gem uninstall -Ix -i /home/vagrant/.rvm/gems/jruby-*@global bundler
+gem install bundler -v 1.7.11
 
 <% if config[:xn_key] -%>
 silent gem sources --add https://<%= config[:xn_key] %>@gems.xnlogic.com/
@@ -51,7 +53,7 @@ sudo mkdir -p /opt/xn_apps
 sudo chown vagrant /opt/xn_apps
 cd
 
-wget http://s3.amazonaws.com/xn-dev/dist/xn.dev.1.0.37.tbz -O $HOME/xn.dev.tbz --quiet
+wget http://s3.amazonaws.com/xn-dev/dist/xn.dev.1.0.38.tbz -O $HOME/xn.dev.tbz --quiet
 tar -xjf xn.dev.tbz
 rm xn.dev.tbz
 cd xn.dev
@@ -63,8 +65,12 @@ if [ -d $HOME/$XN_CLIENT/assets ]; then
   hr
   echo "Configuring Assets"
   cd $HOME/$XN_CLIENT/assets
-  bundle install
-  npm install
+  if [ -f Gemfile ]; then
+    bundle install
+  fi
+  if [ -f package.json ]; then
+    npm install
+  fi
 fi
 
 ## Uncomment to upgrade Datomic

data/lib/xnlogic/version.rb

@@ -1,3 +1,3 @@
 module Xnlogic
-  VERSION = "1.0.37"
+  VERSION = "1.0.38"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xnlogic
 version: !ruby/object:Gem::Version
-  version: 1.0.37
+  version: 1.0.38
 platform: ruby
 authors:
 - Darrick Wiebe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-24 00:00:00.000000000 Z
+date: 2015-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -110,6 +110,7 @@ files:
 - lib/xnlogic/templates/application/assets/images/xnlogic-logo-site.png
 - lib/xnlogic/templates/application/assets/index.html.tt
 - lib/xnlogic/templates/application/config.ru.tt
+- lib/xnlogic/templates/application/config/mcfly_config.yaml.tt
 - lib/xnlogic/templates/application/dev/console.rb.tt
 - lib/xnlogic/templates/application/gemspec.tt
 - lib/xnlogic/templates/application/gitignore.tt