xnlogic 1.0.12 → 1.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ff9ac3730febdacf1ea97fc3b31aca65989c8bc
-  data.tar.gz: cea5c7cbc7072c694abe5004dd551d4f9ebf05a8
+  metadata.gz: 299ab70034659023e913de149bca9617c4bba1a3
+  data.tar.gz: 2c7e6a3c380a1f52280c0fcd173a448ee7d91afb
 SHA512:
-  metadata.gz: 480520f7a0331a2d11c154a95809e6a6e74a14ba73957747ec4008dc8283388ac98d0a9f91f1eea6ae5721a47afaa33553ef9addc6cc56b8741bd270ce082025
-  data.tar.gz: 3a49ba51595c08e4c33d1471adc4f505ddc99e881dfb982ed3a396fa8f49ee982ec930167c430a4658598bf37858b32ccd38ff31d971816cd210fa8077e0bcea
+  metadata.gz: 9089d3094f283cf5e518733bf95a8c6a6c1601d0c8c533092e8c1faeb45f2616e524bad5e15fbb91fa419a656b05a33076b63ef00d70e90cf996337acf470052
+  data.tar.gz: 05b1e39cc0b4c0b8c123d3e3b3cd7e13058fbf26bdecac89963227a7931e203c2277af67bb5eb1268a08e3d7b1f13d32fba8e1077a3bd89aa5482589e66c646f

data/lib/xnlogic/cli/application.rb

@@ -1,26 +1,101 @@
 require 'pathname'
+require 'yaml'
 
 module Xnlogic
   class CLI::Application
     attr_reader :options, :app_name, :thor, :base_name, :name, :app, :root
 
-    def initialize(options, app_name, thor)
-      @options = options
+    def initialize(options, thor)
+      @options = {}.merge options
       @app_name = app_name
       @thor = thor
+    end
 
+    def set_name(app_name)
       @name = app_name.chomp("/").tr('-', '_') # remove trailing slash if present
       @root = options.fetch('root', @name)
       @app = Pathname.pwd.join(root)
+      options[:name] = @name
+      self
+    end
+
+    def options_file
+      app + 'config/app_options.yaml'
+    end
+
+    def in_existing_project
+      @root = options.fetch('root', '.')
+      @app = Pathname.pwd.join(root)
+      if options_file.exist?
+        previous_options = YAML.load_file(options_file.to_s)
+        @options = previous_options.merge options
+        @name ||= options[:name]
+        self
+      else
+        Xnlogic.ui.info "Not in an existing project. Please run the 'application' command first."
+        exit 1
+      end
     end
 
-    def run
+    def write_options
+      File.open(options_file.to_s, 'w') do |f|
+        f.puts YAML.dump options
+      end
+    end
+
+    def application
+      generate_vm_config unless options[:vm_config]
+      generate_application
+      write_options
+      Xnlogic.ui.info "Initializing git repo in #{app}"
+      Dir.chdir(app) { `git init`; `git add .` }
+
+      install_vagrant_note
+      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.ui.info "Once logged in to the server, try the xn-console and xn-server commands"
+    end
+
+    def vm_config
+      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."
+    end
+
+    def deployment
+      generate_deployment
+      write_options
+      Xnlogic.ui.info ""
+      Xnlogic.ui.info "Deployment files generated. You must deploy from within your app by using the xn-deploy command."
+      Xnlogic.ui.info ""
+    end
+
+    def install_vagrant_note
+      if `which vagrant` == ''
+        Xnlogic.ui.info ""
+        Xnlogic.ui.info "Please ensure that the following dependencies are installed on your computer"
+        Xnlogic.ui.info "to continue."
+        Xnlogic.ui.info " - Vagrant:    https://www.vagrantup.com/"
+        Xnlogic.ui.info " - VirtualBox: https://www.virtualbox.org/wiki/Downloads"
+      end
+    end
+
+    def template_options
       namespaced_path = name
       constant_name = namespaced_path.split('_').map{|p| p[0..0].upcase + p[1..-1] }.join
       git_user_name = `git config user.name`.chomp
       git_user_email = `git config user.email`.chomp
-
-      opts = {
+      {
         :name            => name,
         :namespaced_path => namespaced_path,
         :constant_name   => constant_name,
@@ -30,7 +105,10 @@ module Xnlogic
         :vm_memory       => options['memory'],
         :xn_key          => options['key'],
       }
+    end
 
+    def generate_vm_config
+      opts = template_options
       base_templates = {
         "Vagrantfile.tt" => "Vagrantfile",
         "config/vagrant.provision.tt" => "config/vagrant.provision",
@@ -38,10 +116,17 @@ module Xnlogic
         "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
+    end
 
+    def generate_application
+      opts = template_options
+      namespaced_path = opts[:namespaced_path]
       templates = {
         "gitignore.tt" => ".gitignore",
         ".rspec.tt" => ".rspec",
@@ -68,29 +153,27 @@ 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
+    end
 
-      Xnlogic.ui.info "Creating Vagrant config."
-      Xnlogic.ui.info ""
-      Xnlogic.ui.info "Initializing git repo in #{app}"
-      Dir.chdir(app) { `git init`; `git add .` }
+    def generate_deployment
+      opts = template_options
+      base_templates = {
+      }
 
       Xnlogic.ui.info ""
-      Xnlogic.ui.info "Please ensure that the following dependencies are installed on your computer"
-      Xnlogic.ui.info "to continue."
-      Xnlogic.ui.info " - Vagrant:    https://www.vagrantup.com/"
-      Xnlogic.ui.info " - VirtualBox: https://www.virtualbox.org/wiki/Downloads"
-      Xnlogic.ui.info ""
-      Xnlogic.ui.info "Then run the following:"
+      Xnlogic.ui.info "Creating Vagrant configuration"
       Xnlogic.ui.info ""
-      Xnlogic.ui.info "cd #{root}"
-      Xnlogic.ui.info "vagrant up"
-      Xnlogic.ui.info "vagrant ssh"
-      Xnlogic.ui.info ""
-      Xnlogic.ui.info "Once logged in to the server, the project directory is ~/xn.dev"
+      base_templates.each do |src, dst|
+        thor.template("deployment/#{src}", app.join('deployment').join(dst), opts)
+      end
     end
+
   end
 end
 

data/lib/xnlogic/cli.rb

@@ -2,6 +2,7 @@ require 'thor'
 
 module Xnlogic
   class CLI < Thor
+    require 'xnlogic/cli/application'
     include Thor::Actions
 
     def self.start(*)
@@ -53,20 +54,50 @@ module Xnlogic
       Kernel.exec(command_path, *ARGV[1..-1])
     end
 
+
+    def self.vm_config_options
+      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 "cpus", type: :numeric, banner:
+        "Number of Virtual CPUs the Development VM should use"
+      method_option "memory", type: :numeric, banner:
+        "Amount of RAM to allow the Development VM to use (in MB)"
+      method_option "root", type: :string, banner:
+        "Optionally specify a different root directory name"
+    end
+
     desc "application NAME [OPTIONS]", "Creates a skeleton of an XN Logic 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"
-    method_option "root", type: :string, banner:
-      "Optionally specify a different root directory name"
-    method_option "cpus", type: :numeric, banner:
-      "Number of Virtual CPUs the Development VM should use"
-    method_option "memory", type: :numeric, 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
+    vm_config_options
+    method_option "vm_config", type: :boolean, default: true, banner:
+      "Generate VM configuration files"
+    method_option "same", type: :boolean, default: false, banner:
+      "Use previous config"
+    def application(name = nil)
+      app = Application.new(options, self)
+      if options['same'] or name.nil?
+        app.in_existing_project
+      else
+        app.set_name(name)
+      end
+      app.application
     end
 
+    desc "vm_config [OPTIONS]", "Adds Vagrant configuration to the current project"
+    vm_config_options
+    method_option "name", type: :string, banner:
+      "Optionally specify a different project name"
+    def vm_config
+      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
+
+
     def self.source_root
       File.expand_path(File.join(File.dirname(__FILE__), 'templates'))
     end

data/lib/xnlogic/version.rb

@@ -1,3 +1,3 @@
 module Xnlogic
-  VERSION = "1.0.12"
+  VERSION = "1.0.13"
 end

metadata

@@ -1,71 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: xnlogic
 version: !ruby/object:Gem::Version
-  version: 1.0.12
+  version: 1.0.13
 platform: ruby
 authors:
 - Darrick Wiebe
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
 date: 2015-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  requirement: !ruby/object:Gem::Requirement
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: bundler
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
-  requirement: !ruby/object:Gem::Requirement
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency
   name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: ronn
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
-  prerelease: false
+        version: 0.7.3
   type: :development
-- !ruby/object:Gem::Dependency
-  name: xn_gem_release_tasks
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.8
+        version: 0.7.3
+- !ruby/object:Gem::Dependency
+  name: xn_gem_release_tasks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.8
-  prerelease: false
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.8
 description: Build graph applications with XN Logic.
 email:
 - dw@xnlogic.com
@@ -74,7 +88,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - README.md
 - Rakefile
@@ -120,24 +134,24 @@ files:
 homepage: https://xnlogic.com
 licenses: []
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.4.5
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.2.2
+signing_key: 
 specification_version: 4
 summary: XN Logic command-line tools
 test_files: []