sistero 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7169883de6150a292655a7a630d7d641cf864721
-  data.tar.gz: 6e984359031fb537c92d67688c752a25675b8dd9
+  metadata.gz: 0bc5e43a952d3731e1d79c44cea1d2f0d2a8b4d5
+  data.tar.gz: 2381e2b68a59334a1c96eefe1d34e4e4db83493f
 SHA512:
-  metadata.gz: ba7d79891159a85f01f3925c5158aecfdb50f4d0db9dd71facc7bd80c887e09abfe0bc2e953d3735d1e7f010dc5ca23882d9aa49bf01871fdb649e645d4ddbd6
-  data.tar.gz: 973fc678d514e0f2b489a4811fb188b20684d81748c50b73ed53e4e3fe7cc30830418a476466676410137e41be18474e49fd126cc6f3f889acb18bddb15a7dd0
+  metadata.gz: 2081cd28ad7a6e7bb0ad30017fab8572e9994f62a5df90e94597612893ad42acc7e0eb8c8cf8a17d4c0ede62482d8fa3521a9b18b4711bc8edb4a9e9f62ccae3
+  data.tar.gz: b73a737357ad1fa3162dd7f36bf9d3516726b4004dd1e6cdee5aaff046945a87f6351fd5743608be322f2d7f2eb1edee5cbcc21b812a2b513fe53d7b7ab28c2b

data/README.md

@@ -1,36 +1,39 @@
 # Sistero
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/sistero`. To experiment with that code, run `bin/console` for an interactive prompt.
-
-TODO: Delete this and the text above, and describe your gem
+sistero is a profile based tool to manage a digital ocean cluster.
 
 ## Installation
 
-Add this line to your application's Gemfile:
-
-```ruby
-gem 'sistero'
-```
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install sistero
+```gem install sistero```
 
 ## Usage
 
-TODO: Write usage instructions here
-
-## Development
+Create a config file at `.config/sistero` with something like:
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
-
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+```
+---
+defaults:
+  vm_name: my_default_vm_name
+  ssh_keys:
+    - 1234567
+  ssh_options: -D1080 -A
+  access_token: f788fffffffffffff8ffffffffffffffffffffff8fffffffffffffffffffffff
+  vm_size: 512
+  vm_region: nyc3
+  vm_image: ubuntu-14-04-x64
+london:
+  vm_name: my_london_vm_name
+  vm_region: lon1
+```
 
-## Contributing
+The `ssh_keys` is a list of the ID numbers of your ssh keys.
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/sistero.
+Then to create a VM in new york:
+```
+sistero create
+```
 
+Or to create a VM configured the same only in London:
+```
+sistero -p london create
+```

data/bin/sistero

@@ -6,6 +6,8 @@ require 'optparse/subcommand'
 
 module Sistero::Command
   @config = OpenStruct.new
+  @config.profile_name = 'default'
+
   @subcommands = []
   @op = nil
 
@@ -44,6 +46,10 @@ module Sistero::Command
         exit
       end
 
+      op.on '-p val', '--profile', 'set profile' do |profile_name|
+        @config.profile_name = profile_name
+      end
+
       subcommand 'ssh', 'ssh to vm' do |subop|
         subop.on '-o val', 'add ssh options' do |ssh_options|
           @config.ssh_options = ssh_options
@@ -67,11 +73,11 @@ module Sistero::Command
     sistero = Sistero::Instance.new
     case @config.action
     when 'ssh'
-      sistero.ssh_to_vm(ssh_options: @config.ssh_options)
+      sistero.ssh_to_vm(@config.profile_name, ssh_options: @config.ssh_options)
     when 'create'
-      sistero.create_vm()
+      sistero.create_vm(@config.profile_name)
     when 'destroy'
-      sistero.destroy_vm()
+      sistero.destroy_vm(@config.profile_name)
     when 'list'
       sistero.list_vms()
     end

data/lib/sistero/version.rb

@@ -1,3 +1,3 @@
 module Sistero
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/lib/sistero.rb

@@ -5,57 +5,52 @@ require "droplet_kit"
 APP_NAME = "sistero"
 
 module Sistero
+  Profile = Struct.new(:access_token, :ssh_keys, :ssh_options, :vm_name, :vm_size, :vm_region, :vm_image)
+  # DEFAULTS = {
+  #   :access_token => nil,
+  #   :ssh_keys => [],
+  #   :ssh_options => '',
+  #   :vm_name => nil,
+  #   :vm_size => 512,
+  #   :vm_region => 'nyc3',
+  #   :vm_image => 'ubuntu-14-04-x64',
+  # }
+
   class Config
-    DEFAULTS = {
-      :access_token => nil,
-      :ssh_keys => [],
-      :ssh_options => '',
-      :vm_name => nil,
-      :vm_size => 512,
-      :vm_region => 'nyc3',
-      :vm_image => 'ubuntu-14-04-x64',
-    }
-
-    attr_accessor *DEFAULTS.keys
-
-    def write_yaml(path, opts)
-      File.open(path, 'w') { |f| f.write opts.to_yaml }
+    attr_accessor :defaults
+
+    def profile name
+      @profiles[name] || @defaults
     end
 
     def initialize(opts = {})
       # read defaults from config file
       cfg_file_path = "#{ENV['HOME']}/.config/#{APP_NAME}"
-      file_opts = {}
-      file_opts = YAML.load_file cfg_file_path if File.exists? cfg_file_path
-
-      dirty = false
-      DEFAULTS.each do |key, default|
-        next if file_opts[key]
-        dirty = true
-        if default
-          print "#{key} [#{default}] = "
-          val = gets.strip
-          val = default if val == ''
-        else
-          print "#{key} = "
-          val = gets.strip
-        end
-        file_opts[key] = val
+      @defaults = Profile.new
+      @profiles = {}
+
+      cfg = YAML.load_file cfg_file_path
+      cfg['defaults'].each do |key, value|
+        @defaults[key] = value
       end
-      write_yaml(cfg_file_path, file_opts) if dirty
 
-      file_opts.merge! opts
-      file_opts.each { |k, v| send("#{k}=", v) }
+      cfg.each do |name, profile_cfg|
+        next if name == 'defaults'
+        profile = @profiles[name] = Profile.new *@defaults
+        profile_cfg.each do |key, value|
+          profile[key] = value
+        end
+      end
     end
   end
 
   class Instance
     def initialize(opts = {})
       @config = Config.new(opts)
-      @client = DropletKit::Client.new(access_token: @config.access_token)
+      @client = DropletKit::Client.new(access_token: @config.defaults.access_token)
     end
 
-    def find_vm(vm_name: @config.vm_name)
+    def find_vm(vm_name:)
       @client.droplets.all.find { |vm| vm.name == vm_name }
     end
 
@@ -65,13 +60,21 @@ module Sistero
       end
     end
 
-    def create_vm(vm_name: @config.vm_name)
+    def create_vm(profile_name, vm_name: nil)
+      profile = @config.profile profile_name
+      vm_name ||= profile.vm_name
+
       puts "creating vm: #{vm_name}"
+
       vm = DropletKit::Droplet.new(
-        name: vm_name, region: @config.vm_region, size: "#{@config.vm_size}mb", image: @config.vm_image, ssh_keys: @config.ssh_keys
+        name: vm_name,
+        region: profile.vm_region,
+        size: "#{profile.vm_size}mb",
+        image: profile.vm_image,
+        ssh_keys: profile.ssh_keys
       )
       vm = @client.droplets.create(vm)
-      puts "created vm: #{vm_name}"
+      puts "created vm: #{profile.to_s}"
       vm
     end
 
@@ -91,9 +94,12 @@ module Sistero
       return false
     end
 
-    def ssh_to_vm(vm_name: @config.vm_name, ssh_options: @config.ssh_options)
-      ssh_options = @config.ssh_options if ssh_options == nil
-      vm = find_vm(vm_name: vm_name) || create_vm(vm_name: vm_name)
+    def ssh_to_vm(profile_name, vm_name: nil, ssh_options: nil)
+      profile = @config.profile profile_name
+      vm_name ||= profile.vm_name
+      ssh_options ||= profile.ssh_options
+
+      vm = find_vm(vm_name: vm_name) || create_vm(profile_name, vm_name: vm_name)
       public_network = vm.networks.v4.find { |network| network.type == 'public' }
       until public_network
         puts "no public interfaces, trying again in a second"
@@ -111,19 +117,21 @@ module Sistero
         end
       end
 
-      # TODO: wait for ssh port to be open
       cmd = "ssh -o 'StrictHostKeyChecking no' #{ssh_options} root@#{ip}"
       puts cmd
       exec cmd
     end
 
-    def destroy_vm(vm_name: @config.vm_name)
+    def destroy_vm(profile_name, vm_name: nil)
+      profile = @config.profile profile_name
+      vm_name ||= profile.vm_name
+
       vm = find_vm(vm_name: vm_name)
       if vm
         puts "destroying #{vm.id}"
         @client.droplets.delete(id: vm.id)
       else
-        puts "vm not found"
+        puts "vm #{vm_name} not found"
       end
     end
   end

data/sistero.gemspec

@@ -9,8 +9,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ["James Pike"]
   spec.email         = ["github@chilon.net"]
 
-  spec.summary       = %q{DigitalOcean developer tools.}
-  spec.description   = %q{Commands for dealing with temporary digital ocean VMs.}
+  spec.summary       = %q{Profile based digital ocean cluster management command line tool.}
+  spec.description   = %q{Profile based digital ocean cluster management command line tool.}
   spec.homepage      = "http://github.com/ohjames/sistero"
 
   # Prevent pushing this gem to RubyGems.org by setting 'allowed_push_host', or

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sistero
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - James Pike
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-30 00:00:00.000000000 Z
+date: 2015-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,7 +80,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Commands for dealing with temporary digital ocean VMs.
+description: Profile based digital ocean cluster management command line tool.
 email:
 - github@chilon.net
 executables:
@@ -125,5 +125,5 @@ rubyforge_project:
 rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
-summary: DigitalOcean developer tools.
+summary: Profile based digital ocean cluster management command line tool.
 test_files: []