vmfloaty 0.2.13 → 0.2.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b950ce194ddc32be50b14e73b343a9b9358fa6d
-  data.tar.gz: 2dc5f421d0155603a5aa790160d6fa99fc1da869
+  metadata.gz: b24b1f8db9ba5d7741f7364868c17976f779cf28
+  data.tar.gz: 3ac32fe7709e6e8a2ba39b32aaa503ce92e0e5ab
 SHA512:
-  metadata.gz: 3043488a66a670178f94b8c47ff0271b9b0709d0b01cd4df58d0d960f218f0f0edeb25f62e8159f4f7874da10fc4734c2825f26c4effd41a6a9c8511d15aea8d
-  data.tar.gz: 87cfe6c1f9c171f5482b385e4d92908c4d2b017d05f56de9f1c71adc6d91051b6b3a060cf4de15d8be94a99bac7c5f04bdd9e3f40cb3859e3ac94a6a97447e27
+  metadata.gz: 67f4beb31fc6fb3b2880177a301648cd431b4d79097d4a2aa4b74211b7446cf146338dafffb425d5feb7b5d34048dd1d557e36f677e82ecdd26576a466c1d2fe
+  data.tar.gz: 63e69b768a855e37d845f7aca4f6221734e1cedeffa63f89453d4ee68da52f65e00dfd5fd553e50b8264dc81240630dbebd5f1e54494800421c910e469e01f52

data/README.md

@@ -1,6 +1,8 @@
 vmfloaty
 ========
 
+[![Gem Version](https://badge.fury.io/rb/vmfloaty.svg)](https://badge.fury.io/rb/vmfloaty)
+
 A CLI helper tool for [Puppet Labs vmpooler](https://github.com/puppetlabs/vmpooler) to help you stay afloat.
 
 <img src="http://i.imgur.com/xGcGwuH.jpg" width=200 height=200>

data/lib/vmfloaty/auth.rb

@@ -37,13 +37,13 @@ class Auth
     end
   end
 
-  def self.token_status(verbose, url, user, password, token)
+  def self.token_status(verbose, url, token)
     if token.nil?
       STDERR.puts 'You did not provide a token'
       exit 1
     end
 
-    conn = Http.get_conn_with_auth(verbose, url, user, password)
+    conn = Http.get_conn(verbose, url)
 
     response = conn.get "/token/#{token}"
     res_body = JSON.parse(response.body)

data/lib/vmfloaty/format.rb

@@ -14,6 +14,6 @@ class Format
       end
     end
 
-    puts host_hash.to_json
+    host_hash.to_json
   end
 end

data/lib/vmfloaty/version.rb

@@ -1,6 +1,6 @@
 
 class Version
-  @version = '0.2.13'
+  @version = '0.2.14'
 
   def self.get
     @version

data/lib/vmfloaty.rb

@@ -64,7 +64,7 @@ class Vmfloaty
 
         unless os_types.nil?
           response = Pooler.retrieve(verbose, os_types, token, url)
-          Format.get_hosts(response)
+          puts Format.get_hosts(response)
         else
           puts 'You did not provide an OS to get'
         end
@@ -239,15 +239,16 @@ class Vmfloaty
         url = options.url ||= config['url']
         token = options.token ||= config['token']
         user = options.user ||= config['user']
-        pass = password "Enter your password please:", '*'
 
         case action
         when "get"
+          pass = password "Enter your password please:", '*'
           puts Auth.get_token(verbose, url, user, pass)
         when "delete"
+          pass = password "Enter your password please:", '*'
           Auth.delete_token(verbose, url, user, pass, token)
         when "status"
-          Auth.token_status(verbose, url, user, pass, token)
+          Auth.token_status(verbose, url, token)
         when nil
           STDERR.puts "No action provided"
         else

data/spec/vmfloaty/auth_spec.rb

@@ -0,0 +1,54 @@
+require 'spec_helper'
+require_relative '../../lib/vmfloaty/auth'
+
+describe Pooler do
+  before :each do
+    @vmpooler_url = "https://vmpooler.example.com"
+  end
+
+  describe "#get_token" do
+    before :each do
+      @get_token_response = "{\"ok\": true,\"token\":\"utpg2i2xswor6h8ttjhu3d47z53yy47y\"}"
+      @token = "utpg2i2xswor6h8ttjhu3d47z53yy47y"
+    end
+
+    it "returns a token from vmpooler" do
+      stub_request(:post, "https://first.last:password@vmpooler.example.com/token").
+                 with(:headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Content-Length'=>'0', 'User-Agent'=>'Faraday v0.9.1'}).
+                 to_return(:status => 200, :body => @get_token_response, :headers => {})
+
+      token = Auth.get_token(false, @vmpooler_url, "first.last", "password")
+      expect(token).to eq @token
+    end
+  end
+
+  describe "#delete_token" do
+    before :each do
+      @delete_token_response = "{\"ok\":true}"
+      @token = "utpg2i2xswor6h8ttjhu3d47z53yy47y"
+    end
+
+    it "deletes the specified token" do
+      stub_request(:delete, "https://first.last:password@vmpooler.example.com/token/utpg2i2xswor6h8ttjhu3d47z53yy47y").
+        with(:headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'User-Agent'=>'Faraday v0.9.1'}).
+        to_return(:status => 200, :body => @delete_token_response, :headers => {})
+
+      #expect(Auth.delete_token(false, @vmpooler_url, "first.last", "password", @token)).to eq @delete_token_response
+    end
+  end
+
+  describe "#token_status" do
+    before :each do
+      @token_status_response = "{\"ok\":true,\"utpg2i2xswor6h8ttjhu3d47z53yy47y\":{\"created\":\"2015-04-28 19:17:47 -0700\"}}"
+      @token = "utpg2i2xswor6h8ttjhu3d47z53yy47y"
+    end
+
+    it "checks the status of a token" do
+      stub_request(:get, "#{@vmpooler_url}/token/utpg2i2xswor6h8ttjhu3d47z53yy47y").
+        with(:headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'User-Agent'=>'Faraday v0.9.1'}).
+        to_return(:status => 200, :body => @token_status_response, :headers => {})
+
+      expect(Auth.token_status(false, @vmpooler_url, @token)).to eq @get_token_response
+    end
+  end
+end

data/spec/vmfloaty/format_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+require 'json'
+require_relative '../../lib/vmfloaty/format'
+
+describe Pooler do
+
+  describe "#get_hosts" do
+    before :each do
+      @hostname_hash = "{\"ok\":true,\"debian-7-i386\":{\"hostname\":[\"sc0o4xqtodlul5w\",\"4m4dkhqiufnjmxy\"]},\"debian-7-x86_64\":{\"hostname\":\"zb91y9qbrbf6d3q\"},\"domain\":\"company.com\"}"
+      @format_hash = "{\"debian-7-i386\":[\"sc0o4xqtodlul5w\",\"4m4dkhqiufnjmxy\"],\"debian-7-x86_64\":\"zb91y9qbrbf6d3q\",\"domain\":\"company.com\"}"
+    end
+
+    it "formats a hostname hash into os, hostnames, and domain name" do
+
+      expect(Format.get_hosts(JSON.parse(@hostname_hash))).to eq @format_hash
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vmfloaty
 version: !ruby/object:Gem::Version
-  version: 0.2.13
+  version: 0.2.14
 platform: ruby
 authors:
 - Brian Cain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-16 00:00:00.000000000 Z
+date: 2015-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -57,6 +57,8 @@ files:
 - lib/vmfloaty/pooler.rb
 - lib/vmfloaty/version.rb
 - spec/spec_helper.rb
+- spec/vmfloaty/auth_spec.rb
+- spec/vmfloaty/format_spec.rb
 - spec/vmfloaty/pooler_spec.rb
 homepage: https://github.com/briancain/vmfloaty
 licenses:
@@ -84,4 +86,6 @@ specification_version: 4
 summary: CLI application to interface with vmpooler
 test_files:
 - spec/spec_helper.rb
+- spec/vmfloaty/auth_spec.rb
+- spec/vmfloaty/format_spec.rb
 - spec/vmfloaty/pooler_spec.rb