xnlogic 1.0.28 → 1.0.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0c76d195dd38887c45cb3607e37b76b46f9aa59
-  data.tar.gz: 609ef7558fc53d793daf06e5d3492a37708000af
+  metadata.gz: a6289c5acc2d9d23ec6c3113e13c8c684e310e6e
+  data.tar.gz: 890996e3dacd9c0ef21ca8c9b394370741dcbb7a
 SHA512:
-  metadata.gz: e150c0fd30e61b5d4e518b378676b10f285198b8cdf9db02dc869c7287641934f3cbbd8106803fe6f9b7dc7755800c8a5f3b950ca7a0357b6710e5a5d447486d
-  data.tar.gz: 8c3a09415dd81ab777031ff6c0b04bffc9a9fb5fd214442f7e1217fdcc4202c3b1f1e87373f98888b1b5de83201beb039562edca79b097747e778de76abf554e
+  metadata.gz: d0c66d6fe416ea7ac2c4839f8d6ff47d86de921d302b2fc1268191478631939204d5e75e4ede10e33667b07fce6581982cd8315c6d32bd40bd87a5fcb44d560d
+  data.tar.gz: a8bef2d0b60b3a1ba0f8b9af75a733d3f2385c69026bc56f91d0664d270f095e03fd99c0fa3080775e755e68a0bf916be3683b6838448baeb7e02a344dae2f4d

data/README.md

@@ -1,6 +1,6 @@
 # xnlogic
 
-Bootstrap your xnlogic.com application with this easy to use executable gem.
+Bootstrap your [xnlogic.com](http://xnlogic.com) application with this easy to use executable gem.
 
 ![gem install xnlogic](https://raw.githubusercontent.com/wiki/xnlogic/xn-gem-template/gif/readme_header.gif)
 
@@ -11,32 +11,54 @@ Bootstrap your xnlogic.com application with this easy to use executable gem.
  
 ## Usage
  
-    $ xnlogic application my_app --key xnuser:xnpassword
+    $ xnlogic application my_app --key xnuser:xnpassword --up
     $ cd my_app
-    $ vagrant up
-    $ vagrant ssh
+    $ xnlogic ssh
 
 From the Vagrant VM, you can then: 
 
     $ xn-server
     $ xn-console
 
-## Development
 
-To execute from your checked out development version, run it as follows:
+## Reference
+
+The general syntax of the command-line tool is
+
+    $ xnlogic COMMAND [ARGS] [OPTIONS]
+    
+And the following commands are available:
+
+| Command | Description |
+| ------- | ----------- |
+| `application` | Create/update an application. |
+| `up` | Start a development VM |
+| `ssh` | Log in to a running development VM |
+| `vm_config`   | Update the configuration and settings of an application. |
+| `provision`   | Apply configuration updates to a running VM |
+| `server_profiles` | Generates a server profile that can be used to configure a production deployment. |
+| `gem_sources` | List gem sources required by this application |
+| `version` | Print the version of the command-line tool |
+| `help` | Display a help page |
+
+You can get more information on each command using
+
+    $ xnlogic help COMMAND
+
 
-    ruby -I ~/dev/xnlogic/lib ~/dev/xnlogic/bin/xnlogic vm_config
 
 ## Contributing
 
-1. Fork it ( https://github.com/[my-github-username]/xnlogic/fork )
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create a new Pull Request
+Pull-requests are welcome.
+If you submit a pull-request, please create a feature branch for your changes.
+
+#### Using the CLI in development
 
+To execute from your checked out development version, run it as follows:
+
+    ruby -I ~/dev/xnlogic/lib ~/dev/xnlogic/bin/xnlogic vm_config
 
-## Releasing a new gem to rubygems:
+#### Releasing a new gem to rubygems:
 
 CI is not set up yet, so once you're happy with the release, simply:
 

data/lib/xnlogic/cli/application.rb

@@ -59,6 +59,7 @@ module Xnlogic
       require_key
       generate_vm_config if options['vm_config']
       generate_application
+      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 .' }
@@ -88,6 +89,7 @@ module Xnlogic
 
     def vm_config
       generate_vm_config
+      options['vm_config_version'] = Xnlogic::VERSION
       write_options
       install_vagrant_note
 
@@ -114,6 +116,26 @@ module Xnlogic
       end
     end
 
+
+    def update_key(xn_key)
+      # Set the option
+      options['key'] = xn_key
+
+      # Check that we are in an existing project folder
+      in_existing_project
+
+      # Gemerate the necessary templates
+      templates = {
+        "Gemfile.tt" => "Gemfile",
+        "config/vagrant.provision.tt" => "config/vagrant.provision",
+      }
+      _generate_templates(templates, 'vagrant', template_options, 'Updating configuration')
+
+      # Write the options YAML file
+      write_options
+    end
+
+
     def template_options
       namespaced_path = name
       constant_name = namespaced_path.split('_').map{|p| p[0..0].upcase + p[1..-1] }.join
@@ -131,24 +153,34 @@ module Xnlogic
       }
     end
 
+
+    def _generate_templates(template_src_to_dst, template_folder, opts, ui_message=nil)
+      if(not ui_message.nil?)
+        Xnlogic.ui.info ""
+        Xnlogic.ui.info ui_message
+        Xnlogic.ui.info ""
+      end
+
+      template_src_to_dst.each do |src, dst|
+        thor.template("#{template_folder}/#{src}", app.join(dst), opts)
+      end
+    end
+
+
     def generate_vm_config
-      opts = template_options
       base_templates = {
         "Vagrantfile.tt" => "Vagrantfile",
         "Gemfile.tt" => "Gemfile",
         "config/vagrant.provision.tt" => "config/vagrant.provision",
         "config/datomic.conf" => "config/datomic.conf",
+        "config/start.sh" => "config/start.sh",
         "config/transactor.properties" => "config/transactor.properties",
       }
 
-      Xnlogic.ui.info ""
-      Xnlogic.ui.info "Creating Vagrant configuration"
-      Xnlogic.ui.info ""
-      base_templates.each do |src, dst|
-        thor.template("vagrant/#{src}", app.join(dst), opts)
-      end
+      _generate_templates(base_templates, 'vagrant', template_options, 'Creating Vagrant configuration')
     end
 
+
     def generate_application
       opts = template_options
       namespaced_path = opts[:namespaced_path]
@@ -179,13 +211,10 @@ module Xnlogic
         "spec/gemname/gemname_spec.rb.tt" => "spec/#{namespaced_path}/#{name}_spec.rb",
       }
 
-      Xnlogic.ui.info ""
-      Xnlogic.ui.info "Creating application templates"
-      Xnlogic.ui.info ""
-      templates.each do |src, dst|
-        thor.template("application/#{src}", app.join(dst), opts)
-      end
+      _generate_templates(templates, 'application', opts, 'Creating application templates')
     end
+
+
   end
 end
 

data/lib/xnlogic/cli/core.rb

@@ -24,6 +24,7 @@ module Xnlogic
     end
 
     def write_options
+      options['last_run_version'] = Xnlogic::VERSION
       Dir.mkdir(app.join('config')) unless app.join('config').exist?
       opts = options.clone
       ignore_options.each do |x|

data/lib/xnlogic/cli.rb

@@ -125,6 +125,12 @@ EOD
       exec 'vagrant ssh'
     end
 
+    desc "key XN_KEY", "Set the key (i.e. xn_user:xn_password) for this application."
+    def key(xn_key)
+      app = Application.new(options, self)
+      app.update_key(xn_key)
+    end
+
     desc "server_profile HOSTNAME [OPTIONS]",
       "Generate a new server profile"
     method_option "ssh_user", type: :string, default: 'deploy', banner:

data/lib/xnlogic/deploy.rb

@@ -1,7 +1,10 @@
 # xnlogic gem does not require these dependencies itself, they are used by the
 # generated app which does require them.
-require 'torquebox-rake-support'
-require 'torquebox-remote-deployer'
+begin
+  # optional dependencies
+  require 'torquebox-rake-support'
+  require 'torquebox-remote-deployer'
+rescue LoadError; nil; end
 
 # Monkey patches deploy utils to modify the environment to allow bundler to run successfully.
 module TorqueBox
@@ -12,6 +15,10 @@ module TorqueBox
       # RUBYOPT has to be unset from the environment so bundler doesn't lose its shit
       env_vars = { 'RUBYOPT' => nil }
 
+
+
+
+
       system(env_vars, "#{cmd} 2>&1")
     end
 

data/lib/xnlogic/man/xnlogic

@@ -43,6 +43,10 @@ Updates an existing application with the current Vagrant VM configuration, or ca
 \fBxnlogic server_profile(1)\fR
 Generates a server profile that can be used to configure a production deployment\.
 .
+.TP
+\fBxnlogic key(1)\fR
+Updates the key (i\.e\. xn_user:xn_password) used by an existing application\.
+.
 .SH "UTILITY COMMANDS"
 .
 .TP

data/lib/xnlogic/man/xnlogic.txt

@@ -38,16 +38,20 @@ APPLICATION UPDATES
 	      Generates  a server profile that can be used to configure a pro-
 	      duction deployment.
 
+       xnlogic key(1)
+	      Updates the key (i.e. xn_user:xn_password) used by  an  existing
+	      application.
+
 UTILITY COMMANDS
        xnlogic up(1)
-	      Starts the development VM. On the first run (only) it will  also
+	      Starts  the development VM. On the first run (only) it will also
 	      provision it.
 
        xnlogic ssh(1)
 	      Interactively log into the development VM.
 
        xnlogic provision(1)
-	      Update   a   running   VM's  configuration  to  match  the  con-
+	      Update  a  running  VM's	configuration  to   match   the   con-
 	      fig/vagrant.provision script.
 
        xnlogic gem_sources(1)

data/lib/xnlogic/server_profile.rb

@@ -1,54 +1,70 @@
-if defined?(Capistrano)
-  # Captures Capistrano-relevant configuration from a server profile.
-  class CapConfig
-    class << self
-      attr_reader :roles, :variables
-
-      def configure(&config_block)
-        @roles = {}
-        @variables = {}
-        instance_eval &config_block
-      end
-
-      # config_binding is the binding taken from the Capistrano configuration file
-      def apply_config(config_binding)
-        roles.each { |role, user| config_binding.eval("role #{role.inspect}, #{user.inspect}") }
-        variables.each { |name, val| config_binding.eval("set #{name.inspect}, #{val.inspect}") }
-      end
-
-      # Setters
-
-      def hostname(hn)
-        @roles[:web] = hn
-      end
-
-      def api_hostname(hn)
-        @variables[:api_hostname] = hn
-      end
-
-      def user(u)
-        @variables[:user] = u
-      end
-
-      def method_missing(symbol, *args)
-        # Swallow config settings we don't care about
-      end
+# Captures Capistrano-relevant configuration from a server profile.
+class DeployConfig
+  class << self
+    attr_reader :roles, :variables
+
+    def configure(&config_block)
+      @roles = {}
+      @variables = {}
+      instance_eval &config_block
     end
-  end
 
-  def server_profile(&config_block)
-    CapConfig.configure(&config_block)
+    # config_binding is the binding taken from the Capistrano configuration file
+    def apply_cap_config(config_binding)
+      roles.each { |role, user| config_binding.eval("role #{role.inspect}, #{user.inspect}") }
+      variables.each { |name, val| config_binding.eval("set #{name.inspect}, #{val.inspect}") }
+    end
+
+    # Setters
+
+    def hostname(hn)
+      @roles[:web] = hn
+    end
+
+    def api_hostname(hn)
+      @variables[:api_hostname] = hn
+    end
+
+    def user(u)
+      @variables[:user] = u
+    end
+
+    def ssl_cert(cert_path)
+      @variables[:ssl_cert] = cert
+    end
+
+    def nginx_conf(file_path)
+      @variables[:nginx_conf] = cert
+    end
+
+    def method_missing(symbol, *args)
+      # Swallow config settings we don't care about
+    end
   end
-else # torquebox remote deployer
+end
+
+if defined? TorqueBox
   # Monkey patching this to extend the configuration
   class TorqueBox::RemoteDeploy
     def api_hostname(hn)
       # Unused
     end
+
+    def ssl_cert(cert_path)
+      # Unused
+    end
+
+    def nginx_conf(file_path)
+      # Unused
+    end
   end
 
   def server_profile(&config_block)
+    DeployConfig.configure(&config_block)
     TorqueBox::RemoteDeploy.configure(&config_block)
   end
+else
+  def server_profile(&config_block)
+    DeployConfig.configure(&config_block)
+  end
 end
-

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

@@ -9,4 +9,3 @@ rescue LoadError => e
   puts e
   puts e.backtrace.join("\n")
 end
-

data/lib/xnlogic/templates/application/dev/console.rb.tt

@@ -2,5 +2,6 @@ require 'torquebox-messaging'
 require '<%= config[:namespaced_path] %>'
 
 # Silence Datomic's verbose console logs
-org.slf4j.LoggerFactory.getILoggerFactory.reset
+factory = org.slf4j.LoggerFactory.getILoggerFactory
+factory.reset if factory.respond_to? :reset
 

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

@@ -10,4 +10,8 @@ source "https://rubygems.org/"
 
 gemspec
 
-eval File.read('Gemfile-custom') if File.exist?('Gemfile-custom')
+unless ENV['CONFIG_FILE'] # ie. deployment
+  # Gemfile-custom is .gitignored, but evaluated here so you can add
+  # whatever dev tools you like to use to your local environment.
+  eval File.read('Gemfile-custom') if File.exist?('Gemfile-custom')
+end

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

@@ -0,0 +1,86 @@
+
+#!/bin/bash
+
+export XN_LOG_DIR=$HOME/xn.dev/tmp
+
+silent() { if [[ $debug ]] ; then "$@"; else "$@" &>/dev/null; fi; }
+
+# Check for jruby 1.7, don't force it.
+if [[ `ruby -v` == jruby\ 1.7* ]]; then
+  echo "Using `ruby -v`"
+else
+  echo "Unsupported Ruby version: (`ruby -v | cut -c 1-35`)"
+  echo "Please try again with jruby-1.7.x"
+fi
+echo '{"note":"Suppressing Torquebox logs."}' | json -i | cat
+
+
+cd $HOME/xn.dev
+
+mkdir -p $XN_LOG_DIR
+cd $XN_LOG_DIR
+touch xn.js.log xnlogic.json development.log ${XN_CLIENT}-assets.log
+cd -
+
+cd fe/xn.js
+cake serve &> $XN_LOG_DIR/xn.js.log &
+echo "xn.js started"
+cd -
+
+
+
+ASSETS_DIR=$HOME/$XN_CLIENT/assets
+if [ -d $ASSETS_DIR ]; then
+  ASSETS_PORT=3031
+
+  cd $ASSETS_DIR
+
+  script/duster -w assets/templates assets/javascripts/templates.js &> $XN_LOG_DIR/duster.js.log &
+
+  bundle exec rackup -p $ASSETS_PORT &> $XN_LOG_DIR/${XN_CLIENT}-assets.log &
+
+  cd -
+fi
+
+
+
+
+START_APPS=$HOME/$XN_CLIENT/apps/apps.start.sh
+if [ -x $START_APPS ]; then
+  cd $HOME/$XN_CLIENT/apps
+  $START_APPS &
+  cd -
+fi
+
+
+
+
+cd $HOME/xn.dev
+
+
+tail -n 0 -f fe/fe-server/log/development.log $XN_LOG_DIR/xn.js.log $XN_LOG_DIR/${XN_CLIENT}-assets.log &
+tail -n 0 -f $XN_LOG_DIR/server.log | grep -E "Deployed|Starting deployment|TOPLEVEL_BINDING" &
+
+tail -n 0 -f $XN_LOG_DIR/xnlogic.json | while read line; do echo "$line" | json -i; done &
+
+warn_sigint() {
+  echo "Please wait for shutdown to complete cleanly. (Press Ctrl-C again to force)"
+}
+
+
+# Terminate all processes
+terminator() {
+  trap 'warn_sigint' SIGINT
+  echo "Shutting down support processes..."
+  jobs -p | xargs kill -s SIGTERM
+  echo "Shutting down jboss..."
+  silent $JBOSS_HOME/bin/jboss-cli.sh --connect :shutdown
+}
+trap 'terminator' SIGINT
+
+export RELOAD=true
+echo "starting torquebox"
+lsof -i :8080 -sTCP:listen | grep . || torquebox run &> /dev/null  &
+echo "Hit Ctrl+C to terminate"
+cat
+at

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

@@ -58,15 +58,13 @@ cd xn.dev
 source script/setup_stack
 echo jruby-${jruby_version} > .ruby-version
 cd fe/xn.js
-sudo npm install --loglevel silent
+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
@@ -80,7 +78,8 @@ sudo start datomic
 hr
 echo "Customizing .zshrc for $XN_CLIENT development"
 echo "export XN_CLIENT=$XN_CLIENT" >> ~/.zshrc
-echo "alias xn-server='(cd ~/xn.dev && ./script/start);'" >> ~/.zshrc
+chmod +x $XN_CLIENT/config/start.sh
+echo "alias xn-server=$XN_CLIENT/config/start.sh" >> ~/.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 'JRUBY_OPTS=--dev source $HOME/xn.dev/script/setup_stack' >> ~/.zshrc
@@ -98,12 +97,20 @@ git config --global --add alias.lg "log --color --graph --pretty=format:'%Cred%h
 git config --global --add alias.lga "log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --all"
 git config --global --add alias.branches "submodule foreach 'git branch | grep \*'"
 
-
-
 hr
 echo "Configuring $XN_CLIENT"
 cd $HOME/$XN_CLIENT
 bundle
 torquebox deploy
+
+PROVISION_APPS=$HOME/$XN_CLIENT/apps/apps.provision.sh
+if [ -x $PROVISION_APPS ]; then
+  hr
+  echo "Provisioning Custom Apps"
+  cd $HOME/$XN_CLIENT/apps
+  $PROVISION_APPS
+  cd -
+fi
+
 hr
 echo "Done!"

data/lib/xnlogic/version.rb

@@ -1,3 +1,3 @@
 module Xnlogic
-  VERSION = "1.0.28"
+  VERSION = "1.0.29"
 end

data/man/xnlogic.ronn

@@ -37,6 +37,9 @@ We divide `xnlogic` subcommands into the initial command, update commands, and u
 * `xnlogic server_profile(1)`:
   Generates a server profile that can be used to configure a production deployment.
 
+* `xnlogic key(1)`:
+  Updates the key (i.e. xn_user:xn_password) used by an existing application.
+
 ## UTILITY COMMANDS
 
 * `xnlogic up(1)`:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xnlogic
 version: !ruby/object:Gem::Version
-  version: 1.0.28
+  version: 1.0.29
 platform: ruby
 authors:
 - Darrick Wiebe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-10 00:00:00.000000000 Z
+date: 2015-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -126,10 +126,12 @@ files:
 - lib/xnlogic/templates/application/tasks/deploy.rb.tt
 - lib/xnlogic/templates/application/torquebox.yml.tt
 - lib/xnlogic/templates/application/torquebox_init.rb.tt
+- lib/xnlogic/templates/deploy/nginx.conf.tt
 - lib/xnlogic/templates/deploy/server_profiles/profile.rb.tt
 - lib/xnlogic/templates/vagrant/Gemfile.tt
 - lib/xnlogic/templates/vagrant/Vagrantfile.tt
 - lib/xnlogic/templates/vagrant/config/datomic.conf
+- lib/xnlogic/templates/vagrant/config/start.sh
 - lib/xnlogic/templates/vagrant/config/transactor.properties
 - lib/xnlogic/templates/vagrant/config/vagrant.provision.tt
 - lib/xnlogic/ui.rb