niso 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44a5eba8f95a0e95645da843a3f3f17c342bdc42
-  data.tar.gz: aa7b1186b90247e42dfc3af1086b8b554333fc6d
+  metadata.gz: 0074b90f949a83689f8db0031d321a8db28d939c
+  data.tar.gz: 31135e9d544df3c9accd52c3b76d9170bd522cc1
 SHA512:
-  metadata.gz: f3190d8deba79bb938f78fca3580a840a04906b83420819b023b75b90654487619b6cecc7e7b7ebbe9fd6eb4319297a80d19c72cd685e526248bd882f4bdccf5
-  data.tar.gz: 36244fbc3c8b5be59fd58afd3f4d82272b6a2584494f14e2101f85ef770b17180a1a842d5343ffb3f2d1cf491ac3572f72d6bdc80417dd0520ecdc378394b14b
+  metadata.gz: 89a037a690ad3174fcf675b5692671ea1e907f9b06805451279cd168a25b3379d85236f1c5dfc716b3ab91f9c14d9690ed2976f2118e5a8f232044d9846a5f70
+  data.tar.gz: 2a4303b6f1b3e0cba82ce9b834eeb71aa6523615d6aae3b4ba5d8805e178b519cc717849799391100e71b1f680d291800bbe2b20d1269305699422b0bdd54db0

data/.travis.yml

@@ -1,3 +1,7 @@
 language: ruby
 rvm:
+  - 2.0.0
+  - 2.1.6
+  - 2.2.6
+  - 2.3.3
   - 2.4.0

data/CHANGELOG.md

@@ -1,21 +1,8 @@
+## 2.0.4, release 2017-03-30
+* bug fixes
+* updated to set dependencies
+
 ## 2.0, release 2017-03-28
 * updated to explicitly use digital ocean for `niso setup` and `niso teardown`
 * added `droplet_kit`
 * removed `digital_ocean`
-
-## 1.5, release 2013-09-27
-* `niso deploy [linode|digital_ocean] [name]` will deploy to the instance with additional attributes.
-
-## 1.4, release 2013-09-27
-* `niso teardown` no longer requires instance names as an argument, it lets you choose from a list instead.
-
-## Past Releases
-* v1.3: SSH config support. Thanks to @toooooooby
-* v1.2: Evaluate everything as ERB templates by default. Added "files" folder.
-* v1.1: "set -e" by default. apt-get everywhere in place of aptitude. Linode DNS support for DigitalOcean instances.
-* v1.0: System functions are refactored into niso.mute() and niso.install().
-* v0.9: Support for [DigitalOcean](https://www.digitalocean.com) setup / teardown.
-* v0.8: Added `--sudo` option to `niso deploy`.
-* v0.7: Added `erase_remote_folder` and `cache_remote_recipes` preferences for customized behavior.
-* v0.6: System function niso::silencer() added for succinct log messages.
-* v0.5: Role-based configuration supported. Reworked directory structure. **Incompatible with previous versions**.

data/README.md

@@ -1,5 +1,7 @@
 # nîso ᓃᓱ
 
+[![Gem Version](https://badge.fury.io/rb/niso.svg)](https://badge.fury.io/rb/niso) [![Build Status](https://travis-ci.org/dakotalightning/niso.svg?branch=master)](https://travis-ci.org/dakotalightning/niso)
+
     niso is the number 2 (two) in Cree
 
 ## Quickstart
@@ -66,24 +68,31 @@ For instance, when you set up a new web server, deploy with a role name:
 
 It is equivalent to running `install.sh`, followed by `web.sh`.
 
-### Requirements
+## Requirements
 
 For `niso deploy`
 
     $ [sudo] gem install droplet_kit
     $ [sudo] gem install highline
 
-### DigitalOcean
+## DigitalOcean
 You can setup a new VM, or teardown an existing VM interactively. Use `niso setup` and `niso teardown` for that.
 
 [DigitalOcean](https://www.digitalocean.com) only.
 
 v2.0 of the DigitalOcean API is supported — get your [access token](https://cloud.digitalocean.com/api_access).
 
-### What's new:
+## Changelong:
 
 Please see the [CHANGELOG](https://github.com/dakotalightning/niso/blob/master/CHANGELOG.md).
 
+## Contributing
+
+1. Fork the project
+2. Make your changes, including tests that exercise the code
+3. Summarize your changes in [CHANGELOG](https://github.com/dakotalightning/niso/blob/master/CHANGELOG.md)
+4. Make a pull request
+
 ## Credits
 
 - This project is a hard fork of the proejct [niso](https://github.com/kenn/niso) by [kenn](https://github.com/kenn).

data/lib/niso/cli.rb

@@ -11,7 +11,7 @@ module Niso
       do_create(project)
     end
 
-    desc 'deploy [user@host:port] [role] [--sudo] or deploy droplet [name] [role]  [--sudo]', 'Deploy niso project'
+    desc 'deploy [user@host:port] [role] [--sudo] or deploy do [name] [role]  [--sudo]', 'Deploy niso project'
     method_options :sudo => false
     def deploy(first, *args)
       do_deploy(first, *args)
@@ -23,12 +23,12 @@ module Niso
     end
 
     desc 'setup', 'Setup a new VM'
-    def setup(provider = "droplet_kit")
+    def setup(provider = "do")
       Niso::Cloud.new(self, provider).setup
     end
 
     desc 'teardown', 'Teardown an existing VM'
-    def teardown(provider = "droplet_kit")
+    def teardown(provider = "do")
       Niso::Cloud.new(self, provider).teardown
     end
 
@@ -55,9 +55,9 @@ module Niso
       end
 
       def do_deploy(first, *args)
-        if ['droplet'].include?(first)
+        if ['do'].include?(first)
           @instance_attributes = YAML.load(File.read("#{first}/instances/#{args[0]}.yml"))
-          target = @instance_attributes[:fqdn]
+          target = @instance_attributes[:networks]["v4"].first["ip_address"]
           role = args[1]
         else
           target = first
@@ -115,7 +115,7 @@ module Niso
 
         # Merge instance attributes
         @config['attributes'] ||= {}
-        @config['attributes'].update(Hash[@instance_attributes.map{|k,v| [k.to_s, v] }]) if @instance_attributes
+        # @config['attributes'].update(Hash[@instance_attributes.map{|k,v| [k.to_s, v] }]) if @instance_attributes
 
         # Break down attributes into individual files
         (@config['attributes'] || {}).each {|key, value| create_file "compiled/attributes/#{key}", value }

data/lib/niso/cloud/droplet_kit.rb

@@ -22,22 +22,47 @@ module Niso
         end
 
         # Choose an image
-        if @config['images_filter']
-          result = @client.images.all(type: @config['images_filter'])
-          result = result.select{|i| i.distribution.match Regexp.new(@config['images_filter'], Regexp::IGNORECASE) }
+        if @config["image"]
+          @attributes[:image] = @config["image"]
+          say "using config image"
+        else
+          if @config['images_filter']
+            result = @client.images.all(type: @config['images_filter'])
+            result = result.select{|i| i.distribution.match Regexp.new(@config['images_filter'], Regexp::IGNORECASE) }
+          end
+          choose(:image, result)
         end
-        choose(:image, result)
 
         # Go ahead?
-        moveon = ask("Are you ready to go ahead and create #{@attributes}? (y/n) ", ['y','n'])
+        say " - name => #{@ui.color(@name, :blue, :bold)}"
+        @attributes.each do |k,v|
+          say " - #{k} => #{@ui.color(v, :blue, :bold)}"
+        end
+        if @config["private_networking"]
+          say " - private_networking => #{@ui.color(@config["private_networking"].to_s, :blue, :bold)}"
+        end
+        say " - account => #{@ui.color(@client_info.email, :blue, :bold)}"
+        moveon = ask("Are you ready to go ahead? (y/n) ", ['y','n'])
         exit unless moveon == 'y'
 
         ssh_keys = @client.ssh_keys.all.collect { |key| key.fingerprint }
 
         # Create
         say "creating a new droplet..."
-        droplet = ::DropletKit::Droplet.new(name: @config["name"], region: @attributes[:region_slug], image: @attributes[:image_slug], size: @attributes[:size_slug], ssh_keys: ssh_keys)
-        result = @client.droplets.create(droplet)
+        droplet = ::DropletKit::Droplet.new(
+          name: @name,
+          region: @attributes[:region],
+          image: @attributes[:image],
+          size: @attributes[:size],
+          private_networking: @config["private_networking"],
+          ssh_keys: ssh_keys
+        )
+
+        begin
+          result = @client.droplets.create(droplet)
+        rescue ::DropletKit::FailedCreate => e
+          abort_with e.message
+        end
 
         @droplet_id = result.id
         say "Created a new droplet (id: #{@droplet_id}). Booting..."
@@ -47,18 +72,17 @@ module Niso
           sleep 3
         end
 
-        @networks = @client.droplets.find(id: @droplet_id).networks
-        say "Done. networks = #{@networks.ip_address}"
+        @networks = @client.droplets.find(id: @droplet_id).networks.to_h.to_json
+        say "Done."
 
         @instance = {
-          :droplet_id => @droplet_id,
-          :env  => @env,
-          :host => @host,
-          :name => @name,
-          :networks => @networks,
-          :size_slug      => @attributes[:size_slug],
-          :region_slug    => @attributes[:region_slug],
-          :image_slug     => @attributes[:image_slug],
+          droplet_id: @droplet_id,
+          env: @env,
+          name: @name,
+          networks: JSON.parse(@networks),
+          size: @attributes[:size],
+          region: @attributes[:region],
+          image: @attributes[:image],
         }
       end
 
@@ -66,7 +90,7 @@ module Niso
         abort "no #{key} found!" if result.first.nil?
         # result.each{|i| say "#{i.slug}" }
         choices = result.map(&:slug).compact
-        @attributes[:"#{key}_slug"] = ask_menu("which #{key}?: ", choices)
+        @attributes[:"#{key}"] = ask_menu("which #{key}?: ", choices)
       end
 
       def do_teardown
@@ -80,9 +104,7 @@ module Niso
       def setup_client
         begin
           @client = ::DropletKit::Client.new(access_token: @config['access_token'])
-          info = @client.account.info()
-          moveon = ask(" ... continue with #{info.email} account? (y/n) ", String) {|q| q.in = ['y','n']}
-          exit unless moveon == 'y'
+          @client_info = @client.account.info()
         rescue ::DropletKit::Error => e
           abort_with e.message
         end

data/lib/niso/cloud.rb

@@ -4,7 +4,7 @@ module Niso
 
     def initialize(cli, provider)
       @subject = case provider
-      when 'droplet_kit'
+      when 'do'
         Niso::Cloud::DropletKit.new(cli, provider)
       else
         abort_with "Provider #{provider} is not valid!"

data/lib/templates/setup/{droplet_kit.yml → do.yml}

@@ -2,9 +2,10 @@
 access_token: your_api_key
 
 name: example-droplet-01
-# region: sf01
+# region: sfo1
 # image: ubuntu-14-04-x64
 # size: 512mb
+# private_networking: true
 
 # filter out large lists by keyword
 images_filter: ubuntu

data/niso.gemspec

@@ -2,12 +2,12 @@
 
 Gem::Specification.new do |spec|
   spec.name          = 'niso'
-  spec.version       = '2.0.3'
+  spec.version       = '2.0.4'
   spec.authors       = ['Dakota Lightning']
   spec.email         = ['im@koda.io']
   spec.homepage      = 'http://github.com/dakotalightning/niso'
   spec.summary       = %q{Server provisioning utility}
-  spec.description   = %q{Server provisioning utility}
+  spec.description   = %q{Fork of the sunzi project, Plugin based Server provisioning utility}
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files`.split($/)
@@ -15,9 +15,11 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'thor'
-  spec.add_runtime_dependency 'rainbow'
-  spec.add_runtime_dependency 'net-ssh'
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'minitest'
+  spec.required_ruby_version = '>= 2.0.0'
+
+  spec.add_runtime_dependency 'thor', '~> 0.19'
+  spec.add_runtime_dependency 'rainbow', '~> 2.0'
+  spec.add_runtime_dependency 'net-ssh', '~> 3.2'
+  spec.add_development_dependency 'rake', '~> 10.5'
+  spec.add_development_dependency 'minitest', '~> 5.8'
 end

metadata

@@ -1,86 +1,86 @@
 --- !ruby/object:Gem::Specification
 name: niso
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - Dakota Lightning
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-30 00:00:00.000000000 Z
+date: 2017-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.19'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.19'
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.5'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-description: Server provisioning utility
+        version: '5.8'
+description: Fork of the sunzi project, Plugin based Server provisioning utility
 email:
 - im@koda.io
 executables:
@@ -110,7 +110,7 @@ files:
 - lib/templates/create/recipes/niso.sh
 - lib/templates/create/roles/db.sh
 - lib/templates/create/roles/web.sh
-- lib/templates/setup/droplet_kit.yml
+- lib/templates/setup/do.yml
 - niso.gemspec
 - test/niso_test_dir/files/nginx/nginx.conf
 - test/niso_test_dir/recipes/nginx.sh
@@ -127,7 +127,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="