xnlogic 1.0.26 → 1.0.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: abf49c48ec81cbce10678603bf136f6f93147dcd
-  data.tar.gz: 29f457b0595c5510235538a4218bd171ed6cc1b1
+  metadata.gz: cf97ed46cfcde7bf61a82e58f813e43806ab9f28
+  data.tar.gz: eedfa2f846dcfa2d98baa6ef698e9b4816c583d3
 SHA512:
-  metadata.gz: 1274b810da1a3fde1473ff191592cef9da7efa1281c2570906bb9818eb2ada7d90ac6ddeeef1fbc88907b40d08a709ebc7abcdf00765405f6219d154215abc0f
-  data.tar.gz: 9c56d36754200b2651eb2cda9cdb004a91156dc91cbd70624fdb1ca2dd3013b582c4f94632e9323b82bd390ea68ea83400a5f193b8050d7c047601744d7e6a63
+  metadata.gz: 22e4d7ee0ceaaf4e8994726242b7591dd41561d8d8449d6ba1b91ef47133e0f3a1cfe38dec9bd17fd3ffbad5301d2c599d2cf69ec76081c9e36a468f4c1e7f71
+  data.tar.gz: 4820d95814688eb95a76c703b63720b07ca4532740841907766824fa3caffeb8bf8d09016de8f9455dd3e46637fe2b57dadb5de79c14da9edc88a8d31e0c67c8

data/README.md

@@ -9,7 +9,7 @@ Bootstrap your xnlogic.com application with this easy to use executable gem.
 
 ## Usage
 
-    $ xnlogic application my_app
+    $ xnlogic application my_app --key xnuser:xnpassword
     $ cd my_app
     $ vagrant up
     $ vagrant ssh
@@ -19,6 +19,11 @@ From the Vagrant VM, you can then:
     $ xn-server
     $ xn-console
 
+## Development
+
+To execute from your checked out development version, run it as follows:
+
+    ruby -I ~/dev/xnlogic/lib ~/dev/xnlogic/bin/xnlogic vm_config
 
 ## Contributing
 

data/lib/xnlogic/cli/application.rb

@@ -4,6 +4,11 @@ module Xnlogic
   class CLI::Application < CLI::Core
     attr_reader :app_name, :base_name, :name, :root
 
+    def initialize(options, thor)
+      super
+      @ignore_options = ['up', 'provision']
+    end
+
     def set_name(app_name)
       if File.exists?(options_filename)
         Xnlogic.ui.info "Can not create an application within an application."
@@ -56,15 +61,26 @@ module Xnlogic
       generate_application
       write_options
       Xnlogic.ui.info "Initializing git repo in #{app}"
-      Dir.chdir(app) { `git init`; `git add .` }
+      Dir.chdir(app) { system 'git init' and system 'git add .' }
 
       install_vagrant_note
+      if options['up']
+        Dir.chdir(app) { system 'vagrant up' }
+      else
+        Xnlogic.ui.info ""
+        Xnlogic.ui.info "To start your VM, run the following:"
+        Xnlogic.ui.info ""
+        Xnlogic.ui.info "cd #{root}"
+        Xnlogic.ui.info "xnlogic up"
+      end
+
+      if options['provision']
+        Dir.chdir(app) { system 'vagrant provision' }
+      end
+
+      Xnlogic.ui.info "To begin working with your VM, ssh into it with the following command:"
       Xnlogic.ui.info ""
-      Xnlogic.ui.info "To start your VM, run the following:"
-      Xnlogic.ui.info ""
-      Xnlogic.ui.info "cd #{root}"
-      Xnlogic.ui.info "vagrant up"
-      Xnlogic.ui.info "vagrant ssh"
+      Xnlogic.ui.info "xnlogic ssh"
       Xnlogic.ui.info ""
       Xnlogic.ui.info "Once logged in to the server, try the xn-console and xn-server commands"
     end
@@ -73,11 +89,17 @@ module Xnlogic
       generate_vm_config
       write_options
       install_vagrant_note
-      Xnlogic.ui.info ""
-      Xnlogic.ui.info "If you have an existing VM that you are updating, run 'vagrant provision',"
-      Xnlogic.ui.info "otherwise, run 'vagrant up'"
-      Xnlogic.ui.info ""
-      Xnlogic.ui.info "Once that is done, run 'vagrant ssh' to log in to the VM."
+
+      if options['provision'] or options['up']
+        Dir.chdir(app) { system 'vagrant up' } if options['up']
+        Dir.chdir(app) { system 'vagrant provision' } if options['provision']
+      else
+        Xnlogic.ui.info ""
+        Xnlogic.ui.info "If you have an existing VM that you are updating, run 'xnlogic provision',"
+        Xnlogic.ui.info "otherwise, run 'xnlogic up'"
+        Xnlogic.ui.info ""
+      end
+      Xnlogic.ui.info "Once that is done, run 'xnlogic ssh' to log in to the VM."
     end
 
     def install_vagrant_note
@@ -112,6 +134,7 @@ module Xnlogic
       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/transactor.properties" => "config/transactor.properties",
@@ -132,7 +155,6 @@ module Xnlogic
         "gitignore.tt" => ".gitignore",
         ".rspec.tt" => ".rspec",
         "gemspec.tt" => "#{namespaced_path}.gemspec",
-        "Gemfile.tt" => "Gemfile",
         "Rakefile.tt" => "Rakefile",
         "Readme.md.tt" => "Readme.md",
         "config.ru.tt" => "config.ru",

data/lib/xnlogic/cli/core.rb

@@ -3,9 +3,10 @@ require 'yaml'
 
 module Xnlogic
   class CLI::Core
-    attr_reader :options, :thor, :app
+    attr_reader :options, :thor, :app, :ignore_options
 
     def initialize(options, thor)
+      @ignore_options ||= []
       @options = {}.merge options
       @thor = thor
       @app = Pathname.pwd
@@ -24,8 +25,12 @@ module Xnlogic
 
     def write_options
       Dir.mkdir(app.join('config')) unless app.join('config').exist?
+      opts = options.clone
+      ignore_options.each do |x|
+        opts.delete x
+      end
       File.open(options_file.to_s, 'w') do |f|
-        f.puts YAML.dump options
+        f.puts YAML.dump opts
       end
     end
   end

data/lib/xnlogic/cli.rb

@@ -65,6 +65,10 @@ module Xnlogic
         "Amount of RAM to allow the Development VM to use (default 2048, in MB)"
       method_option "root", type: :string, banner:
         "Optionally specify a different root directory name"
+      method_option "provision", type: :boolean, banner:
+        "Update the VM with the new provisioning settings"
+      method_option "up", type: :boolean, banner:
+        "Start the the VM (will provision automatically only on the first run)"
     end
 
     desc "application [NAME] [OPTIONS]", <<EOD
@@ -95,14 +99,6 @@ EOD
       Application.new(options, self).in_existing_project.vm_config
     end
 
-    desc "deployment [OPTIONS]", "Adds Vagrant configuration to the current project"
-    vm_config_options
-    method_option "name", type: :string, banner:
-    def deployment
-      Application.new(options, self).in_existing_project.deployment
-    end
-
-
     desc "gem_sources [OPTIONS]", "Show the gem source URLs as configured in the current application"
     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"
@@ -114,6 +110,20 @@ EOD
       app.show_source "https://#{app.options['key']}@gems.xnlogic.com/"
     end
 
+    desc "up", "Start the VM (and provision only on the first run)"
+    def up
+      system 'vagrant up'
+    end
+
+    desc "provision", "Update the VM with the current provisioning settings"
+    def provision
+      system 'vagrant provision'
+    end
+
+    desc "ssh", "ssh into the VM"
+    def ssh
+      exec 'vagrant ssh'
+    end
 
     desc "server_profile HOSTNAME [OPTIONS]",
       "Generate a new server profile"

data/lib/xnlogic/man/xnlogic

@@ -13,7 +13,10 @@
 Example:
 .
 .P
-xnlogic application my_app \-\-key my_xn_user:password
+xnlogic application my_app \-\-key my_xn_user:password \-\-up
+.
+.P
+xnlogic help application
 .
 .SH "DESCRIPTION"
 XN Logic is a graph database\-backed application framework\.
@@ -37,12 +40,24 @@ Create a simple application, suitable for development with the XN Framework\.
 Updates an existing application with the current Vagrant VM configuration, or can also be used to adjust settings\.
 .
 .TP
-\fBxnlogic deployment(1)\fR
-Generates deployment files in an existing application\.
+\fBxnlogic server_profile(1)\fR
+Generates a server profile that can be used to configure a production deployment\.
 .
 .SH "UTILITY COMMANDS"
 .
 .TP
+\fBxnlogic up(1)\fR
+Starts the development VM\. On the first run (only) it will also provision it\.
+.
+.TP
+\fBxnlogic ssh(1)\fR
+Interactively log into the development VM\.
+.
+.TP
+\fBxnlogic provision(1)\fR
+Update a running VM\'s configuration to match the config/vagrant\.provision script\.
+.
+.TP
 \fBxnlogic gem_sources(1)\fR
 Displays the gem sources needed by this application
 .
@@ -51,7 +66,7 @@ Displays the gem sources needed by this application
 Displays detailed help for each subcommand
 .
 .TP
-\fBxnlogic version\fR
+\fBxnlogic version(1)\fR
 Print the version of the xnlogic command\-line tools\.
 .
 .SH "OPTIONS"

data/lib/xnlogic/man/xnlogic.txt

@@ -10,7 +10,9 @@ SYNOPSIS
 
        Example:
 
-       xnlogic application my_app --key my_xn_user:password
+       xnlogic application my_app --key my_xn_user:password --up
+
+       xnlogic help application
 
 DESCRIPTION
        XN Logic is a graph database-backed application framework.
@@ -32,17 +34,29 @@ APPLICATION UPDATES
 	      Updates an existing application with the current Vagrant VM con-
 	      figuration, or can also be used to adjust settings.
 
-       xnlogic deployment(1)
-	      Generates deployment files in an existing application.
+       xnlogic server_profile(1)
+	      Generates  a server profile that can be used to configure a pro-
+	      duction deployment.
 
 UTILITY COMMANDS
+       xnlogic up(1)
+	      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-
+	      fig/vagrant.provision script.
+
        xnlogic gem_sources(1)
 	      Displays the gem sources needed by this application
 
        xnlogic help(1)
 	      Displays detailed help for each subcommand
 
-       xnlogic version
+       xnlogic version(1)
 	      Print the version of the xnlogic command-line tools.
 
 OPTIONS

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

@@ -0,0 +1,13 @@
+<% if config[:xn_key] -%>
+source "https://<%= config[:xn_key] %>@gems.xnlogic.com"
+<% else -%>
+puts "No key found. You must set the key by running:"
+puts "  xnlogic vm_config --key <your key>"
+puts "then try again."
+exit 1
+<% end -%>
+source "https://rubygems.org/"
+
+gemspec
+
+eval File.read('Gemfile-custom') if File.exist?('Gemfile-custom')

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

@@ -20,9 +20,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # Create a forwarded port mapping which allows access to a specific port
   # within the machine from a port on the host machine. In the example below,
   # accessing "localhost:8080" will access port 80 on the guest machine.
-  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: 8080, host: 8080
 
   # Create a private network, which allows host-only access to the machine
   # using a specific IP.

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

@@ -36,7 +36,14 @@ silent sudo dpkg-reconfigure --frontend noninteractive tzdata
 hr
 echo "Configuring XN gems"
 hr
-gem sources --add https://<%= config[:xn_key] || 'xn:key_required' %>@gems.xnlogic.com/
+
+<% if config[:xn_key] -%>
+silent gem sources --add https://<%= config[:xn_key] %>@gems.xnlogic.com/
+<% else -%>
+echo "No key found. You must set the key by running:"
+echo "  xnlogic vm_config --key <your key> --provision"
+exit 1
+<% end -%>
 
 hr
 echo "Configuring XN"

data/lib/xnlogic/version.rb

@@ -1,3 +1,3 @@
 module Xnlogic
-  VERSION = "1.0.26"
+  VERSION = "1.0.27"
 end

data/man/xnlogic.ronn

@@ -7,7 +7,9 @@ xnlogic(1) -- XN Logic Command-line Tools
 
 Example:
 
-  xnlogic application my_app --key my_xn_user:password
+  xnlogic application my_app --key my_xn_user:password --up
+
+  xnlogic help application
 
 ## DESCRIPTION
 
@@ -32,18 +34,27 @@ We divide `xnlogic` subcommands into the initial command, update commands, and u
   Updates an existing application with the current Vagrant VM configuration, or
   can also be used to adjust settings.
 
-* `xnlogic deployment(1)`:
-  Generates deployment files in an existing application.
+* `xnlogic server_profile(1)`:
+  Generates a server profile that can be used to configure a production deployment.
 
 ## UTILITY COMMANDS
 
+* `xnlogic up(1)`:
+  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 config/vagrant.provision script.
+
 * `xnlogic gem_sources(1)`:
   Displays the gem sources needed by this application
 
 * `xnlogic help(1)`:
   Displays detailed help for each subcommand
 
-* `xnlogic version`:
+* `xnlogic version(1)`:
   Print the version of the xnlogic command-line tools.
 
 ## OPTIONS

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xnlogic
 version: !ruby/object:Gem::Version
-  version: 1.0.26
+  version: 1.0.27
 platform: ruby
 authors:
 - Darrick Wiebe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-08 00:00:00.000000000 Z
+date: 2015-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -104,7 +104,6 @@ files:
 - lib/xnlogic/man/xnlogic.txt
 - lib/xnlogic/server_profile.rb
 - lib/xnlogic/templates/application/.rspec.tt
-- lib/xnlogic/templates/application/Gemfile.tt
 - lib/xnlogic/templates/application/Rakefile.tt
 - lib/xnlogic/templates/application/Readme.md.tt
 - lib/xnlogic/templates/application/config.ru.tt
@@ -128,6 +127,7 @@ files:
 - lib/xnlogic/templates/application/torquebox.yml.tt
 - lib/xnlogic/templates/application/torquebox_init.rb.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/transactor.properties
@@ -158,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: XN Logic command-line tools

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

@@ -1,6 +0,0 @@
-source "https://<%= config[:xn_key] || 'xn:key_required' %>@gems.xnlogic.com"
-source "https://rubygems.org/"
-
-gemspec
-
-eval File.read('Gemfile-custom') if File.exist?('Gemfile-custom')