sunzi 1.5.2 → 2.0.0

data/lib/sunzi/core_ext.rb

@@ -0,0 +1,10 @@
+class Object
+  def abort_with(text)
+    abort text.color(:red).bright
+  end
+
+  def exit_with(text)
+    puts text.color(:green).bright
+    exit
+  end
+end

data/lib/sunzi/dependency.rb

@@ -1,39 +1,36 @@
 module Sunzi
-  class Dependency
-    def self.all
-      {
-        'linode' =>   { :require => 'linode',   :version => '>= 0.7.9' },
-        'highline' => { :require => 'highline', :version => '>= 1.6.11'},
-        'route53' =>  { :require => 'route53',  :version => '>= 0.2.1' },
-        'digital_ocean' =>  { :require => 'digital_ocean',  :version => '>= 1.0.0' },
-      }
-    end
+  class Dependency < Struct.new(:name, :version)
+
+    @list = {}
 
-    def self.load(name)
-      begin
-        gem(name, all[name][:version])
-        require(all[name][:require])
-      rescue LoadError
-        if $!.to_s =~ /Gemfile/
-          Logger.error <<-EOS
-Dependency missing: #{name}
-Add this line to your application's Gemfile.
+    def initialize(*args)
+      super
+      self.class.list[name] = self
+    end
 
-    gem '#{name}', '#{all[name][:version]}'
+    class << self
+      attr_accessor :list
 
-Please try again after running "bundle install".
-          EOS
-        else
-          Logger.error <<-EOS
-Dependency missing: #{name}
-To install the gem, issue the following command:
+      def load(key)
+        unless dependency = @list[key]
+          fail "#{key} is not initialized. Run Sunzi::Dependency.new('#{key}', '~> ...')"
+        end
 
-    gem install #{name} -v '#{all[name][:version]}'
+        name, version = dependency.name, dependency.version
 
-Please try again after installing the missing dependency.
-          EOS
+        begin
+          gem(name, version)
+          require(name)
+        rescue LoadError
+          base = GemRoot.join('templates/dependency')
+          which = if $!.to_s =~ /Gemfile/
+            'gemfile'
+          else
+            'install'
+          end
+          text = ERB.new(base.join("#{which}.erb").read, nil, '-').result(binding)
+          abort_with text
         end
-        abort
       end
     end
   end

data/lib/sunzi/endpoint.rb

@@ -0,0 +1,17 @@
+require 'net/ssh'
+
+module Sunzi
+  class Endpoint
+    attr_reader :user, :host, :port
+
+    def initialize(input)
+      input.match(/(.*@)?(.*?)(:.*)?$/)
+      # Load ssh config if it exists
+      ssh = Net::SSH::Config.for($2)
+
+      @user = $1 && $1.delete('@') || ssh[:user] || 'root'
+      @host = ssh[:host_name] || $2
+      @port = $3 && $3.delete(':') || ssh[:port] && ssh[:port].to_s || '22'
+    end
+  end
+end

data/lib/sunzi/plugin.rb

@@ -0,0 +1,17 @@
+module Sunzi
+  module Plugin
+    class << self
+      # Find gems that start with "sunzi-*" and require them automatically.
+      # If that gem is a plugin, it will call the register method on load.
+
+      def load
+        plugins = Gem::Specification.find_all.select{|plugin| plugin.name =~ /sunzi-.+/ }
+        plugins.each do |plugin|
+          require plugin.name.gsub('-','/')
+
+          Sunzi.thor.source_paths << Pathname.new(plugin.gem_dir)
+        end
+      end
+    end
+  end
+end

data/sunzi.gemspec

@@ -2,22 +2,22 @@
 
 Gem::Specification.new do |spec|
   spec.name          = 'sunzi'
-  spec.version       = '1.5.2' # retrieve this value by: Gem.loaded_specs['sunzi'].version.to_s
+  spec.version       = '2.0.0' # retrieve this value by: Gem.loaded_specs['sunzi'].version.to_s
   spec.authors       = ['Kenn Ejima']
   spec.email         = ['kenn.ejima@gmail.com']
-  spec.homepage      = 'http://github.com/kenn/sunzi'
   spec.summary       = %q{Server provisioning utility for minimalists}
   spec.description   = %q{Server provisioning utility for minimalists}
+  spec.homepage      = 'https://github.com/kenn/sunzi'
   spec.license       = 'MIT'
-
-  spec.files         = `git ls-files`.split($/)
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.files         = `git ls-files -z`.split("\x0").reject {|f| f.match(%r{^(test|spec|features)/}) }
+  spec.bindir        = 'exe'
+  spec.executables   = spec.files.grep(%r{^exe/}) { |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_dependency 'thor', '~> 0.20'
+  spec.add_dependency 'rainbow', '~> 2.2'
+  spec.add_dependency 'net-ssh', '< 5' # 4.x only supports ruby-2.0
+  spec.add_dependency 'hashugar'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'minitest'
 end

data/{lib/templates → templates}/create/install.sh

@@ -1,5 +1,4 @@
 #!/bin/bash
-set -e
 
 # Load base utility functions like sunzi.mute() and sunzi.install()
 source recipes/sunzi.sh
@@ -8,9 +7,14 @@ source recipes/sunzi.sh
 # Remove if you're not on Debian/Ubuntu.
 export DEBIAN_FRONTEND=noninteractive
 
-# Add Dotdeb repository. Recommended if you're using Debian. See http://www.dotdeb.org/about/
-# source recipes/dotdeb.sh
-# source recipes/backports.sh
+# Import initial SSH keys from Github
+if [ -f ~/.ssh/authorized_keys ]; then
+  echo 'authorized_keys already exists'
+else
+  mkdir -p ~/.ssh
+  wget -O - https://github.com/<%= @vars.github_username %>.keys > ~/.ssh/authorized_keys
+  chmod 600 ~/.ssh/authorized_keys
+fi
 
 # Update apt catalog and upgrade installed packages
 sunzi.mute "apt-get update"
@@ -26,7 +30,7 @@ if sunzi.install "sysstat"; then
 fi
 
 # Set RAILS_ENV
-environment=<%= @attributes.environment %>
+environment=<%= @vars.environment %>
 
 if ! grep -Fq "RAILS_ENV" ~/.bash_profile; then
   echo 'Setting up RAILS_ENV...'
@@ -34,9 +38,11 @@ if ! grep -Fq "RAILS_ENV" ~/.bash_profile; then
   source ~/.bash_profile
 fi
 
-# Install Ruby using RVM
+# Install RVM using RVM recipe
 source recipes/rvm.sh
-ruby_version=<%= @attributes.ruby_version %>
+
+# Install Ruby
+ruby_version=<%= @vars.ruby_version %>
 
 if [[ "$(which ruby)" != /usr/local/rvm/rubies/ruby-$ruby_version* ]]; then
   echo "Installing ruby-$ruby_version"

data/templates/create/sunzi.yml

@@ -0,0 +1,27 @@
+---
+# Dynamic variables here will be accessible from shell scripts using ERB templates.
+vars:
+  github_username: kenn
+  environment: production
+  ruby_version: 2.5
+
+# Remote recipes here will be downloaded to compiled/recipes.
+recipes:
+  rvm: https://raw.githubusercontent.com/kenn/sunzi-recipes/master/ruby/rvm.sh
+  # dotdeb: https://raw.githubusercontent.com/kenn/sunzi-recipes/master/debian/dotdeb-wheezy.sh
+  # backports: https://raw.githubusercontent.com/kenn/sunzi-recipes/master/debian/backports-wheezy.sh
+  # mongodb-10gen: https://raw.githubusercontent.com/kenn/sunzi-recipes/master/debian/mongodb-10gen.sh
+
+# Files specified here will be copied to compiled/files.
+# files:
+#   - ~/.ssh/id_rsa.pub
+
+# Fine tune how Sunzi should work.
+preferences:
+  # Erase the generated folder on the server after deploy.
+  # Turn on when you are done with testing and ready for production use.
+  erase_remote_folder: true
+
+  # Skip retrieving remote recipes when local copies already exist. This setting helps
+  # iterative deploy testing considerably faster, when you have a lot of remote recipes.
+  cache_remote_recipes: false

data/templates/dependency/gemfile.erb

@@ -0,0 +1,6 @@
+Dependency missing: <%= name %>
+Add this line to your application's Gemfile.
+
+    gem '<%= name %>', '<%= version %>'
+
+Please try again after running "bundle install".

data/templates/dependency/install.erb

@@ -0,0 +1,6 @@
+Dependency missing: <%= name %>
+To install the gem, issue the following command:
+
+    gem install <%= name %> -v '<%= version %>'
+
+Please try again after installing the missing dependency.

metadata

@@ -1,45 +1,59 @@
 --- !ruby/object:Gem::Specification
 name: sunzi
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Kenn Ejima
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2014-05-19 00:00:00.000000000 Z
+date: 2018-01-14 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.20'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.20'
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: net-ssh
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
+- !ruby/object:Gem::Dependency
+  name: hashugar
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -94,32 +108,28 @@ files:
 - Gemfile
 - README.md
 - Rakefile
-- bin/sunzi
+- bin/console
+- bin/setup
+- exe/sunzi
 - lib/sunzi.rb
+- lib/sunzi/actions.rb
 - lib/sunzi/cli.rb
-- lib/sunzi/cloud.rb
-- lib/sunzi/cloud/base.rb
-- lib/sunzi/cloud/digital_ocean.rb
-- lib/sunzi/cloud/linode.rb
+- lib/sunzi/command.rb
+- lib/sunzi/core_ext.rb
 - lib/sunzi/dependency.rb
-- lib/sunzi/dns.rb
-- lib/sunzi/dns/base.rb
-- lib/sunzi/dns/linode.rb
-- lib/sunzi/dns/route53.rb
-- lib/sunzi/logger.rb
-- lib/sunzi/utility.rb
-- lib/templates/create/.gitignore
-- lib/templates/create/files/.gitkeep
-- lib/templates/create/install.sh
-- lib/templates/create/recipes/sunzi.sh
-- lib/templates/create/roles/db.sh
-- lib/templates/create/roles/web.sh
-- lib/templates/create/sunzi.yml
-- lib/templates/setup/digital_ocean/digital_ocean.yml
-- lib/templates/setup/linode/linode.yml
+- lib/sunzi/endpoint.rb
+- lib/sunzi/plugin.rb
 - sunzi.gemspec
-- test/test_cli.rb
-homepage: http://github.com/kenn/sunzi
+- templates/create/.gitignore
+- templates/create/files/.gitkeep
+- templates/create/install.sh
+- templates/create/recipes/sunzi.sh
+- templates/create/roles/db.sh
+- templates/create/roles/web.sh
+- templates/create/sunzi.yml
+- templates/dependency/gemfile.erb
+- templates/dependency/install.erb
+homepage: https://github.com/kenn/sunzi
 licenses:
 - MIT
 metadata: {}
@@ -139,9 +149,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Server provisioning utility for minimalists
-test_files:
-- test/test_cli.rb
+test_files: []

data/lib/sunzi/cloud.rb

@@ -1,24 +0,0 @@
-module Sunzi
-  class Cloud
-    include Sunzi::Utility
-
-    def initialize(cli, provider)
-      @subject = case provider
-      when 'linode'
-        Sunzi::Cloud::Linode.new(cli, provider)
-      when 'digital_ocean'
-        Sunzi::Cloud::DigitalOcean.new(cli, provider)
-      else
-        abort_with "Provider #{provider} is not valid!"
-      end
-    end
-
-    def method_missing(sym, *args, &block)
-      @subject.send sym, *args, &block
-    end
-
-    def respond_to?(method)
-      @subject.respond_to?(sym) || super
-    end
-  end
-end

data/lib/sunzi/cloud/base.rb

@@ -1,98 +0,0 @@
-Sunzi::Dependency.load('highline')
-
-module Sunzi
-  class Cloud
-    class Base
-      include Sunzi::Utility
-
-      def initialize(cli, provider)
-        @provider = provider
-        @cli = cli
-        @ui = HighLine.new
-      end
-
-      def setup
-        unless File.exist? provider_config_path
-          @cli.empty_directory "#{@provider}/instances"
-          @cli.template "templates/setup/#{provider_config_path}", provider_config_path
-          exit_with "Now go ahead and edit #{@provider}.yml, then run this command again!"
-        end
-
-        assign_config_and_dns
-
-        if @config['fqdn']['zone'] == 'example.com'
-          abort_with "You must have your own settings in #{@provider}.yml"
-        end
-
-        # Ask environment and hostname
-        @env = ask("environment? (#{@config['environments'].join(' / ')}): ", String) {|q| q.in = @config['environments'] }.to_s
-        @host = ask('hostname? (only the first part of subdomain): ', String).to_s
-
-        abort_with '"label" field in linode.yml is no longer supported. rename it to "name".' if @config['label']
-        @fqdn = @config['fqdn'][@env].gsub(/%{host}/, @host)
-        @name = @config['name'][@env].gsub(/%{host}/, @host)
-        abort_with "#{@name} already exists!" if instance_config_path.exist?
-
-        assign_api
-        @attributes = {}
-        do_setup
-
-        # Save instance info
-        @cli.create_file instance_config_path, YAML.dump(@instance)
-
-        # Register IP to DNS
-        @dns.add(@fqdn, @public_ip) if @dns
-      end
-
-      def teardown
-        names = Dir.glob("#{@provider}/instances/*.yml").map{|i| i.split('/').last.sub('.yml','') }
-        abort_with "No match found with #{@provider}/instances/*.yml" if names.empty?
-
-        names.each{|i| say i }
-        @name = ask("which instance?: ", String) {|q| q.in = names }
-
-        assign_config_and_dns
-
-        @instance = YAML.load(instance_config_path.read)
-
-        # Are you sure?
-        moveon = ask("Are you sure about deleting #{@instance[:fqdn]} permanently? (y/n) ", String) {|q| q.in = ['y','n']}
-        exit unless moveon == 'y'
-
-        # Run Linode / DigitalOcean specific tasks
-        assign_api
-        do_teardown
-
-        # Delete DNS record
-        @dns.delete(@instance[ip_key]) if @dns
-
-        # Remove the instance config file
-        @cli.remove_file instance_config_path
-
-        say 'Done.'
-      end
-
-      def assign_config_and_dns
-        @config = YAML.load(provider_config_path.read)
-        @dns = Sunzi::DNS.new(@config, @provider) if @config['dns']
-      end
-
-      def provider_config_path
-        Pathname.new "#{@provider}/#{@provider}.yml"
-      end
-
-      def instance_config_path
-        Pathname.new "#{@provider}/instances/#{@name}.yml"
-      end
-
-      def ask(question, answer_type, &details)
-        @ui.ask(@ui.color(question, :green, :bold), answer_type, &details)
-      end
-
-      def proceed?
-        moveon = ask("Are you ready to go ahead and create #{@fqdn}? (y/n) ", String) {|q| q.in = ['y','n']}
-        exit unless moveon == 'y'
-      end
-    end
-  end
-end