jaxx 0.0.7 → 0.0.8

data/README.md

@@ -44,6 +44,14 @@ Or install it yourself as:
     -h, --help
 ```
 
+### About Me
+```
+  jaxx-aboutme -h
+  jaxx-aboutme [options]
+    -d, --display
+    -h, --help
+```
+
 ## Examples
 
 ### Upload from local machine
@@ -71,6 +79,11 @@ Or install it yourself as:
   jaxx-upload -b test-bucket -f vapour.txt -k MY_KEY -s MY_SECRET -p public
 ```
 
+### Get information on the instance you are currently on
+```
+  jaxx-aboutme -d
+```
+
 ## Contributing
 
 1. Fork it

data/bin/jaxx-aboutme

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+
+$:.unshift File.expand_path('../../lib', __FILE__)
+require 'jaxx/cli'
+Jaxx::CLI.execute(:aboutme, ARGV)

data/features/about_me.feature

@@ -0,0 +1,6 @@
+Feature: About Me
+
+  Scenario:
+    When I run `jaxx-aboutme -h`
+    Then the exit status should be 0
+    And the output should contain "jaxx-aboutme [options]"

data/lib/jaxx/about_me.rb

@@ -0,0 +1,38 @@
+require 'jaxx/environment'
+require 'jaxx/api_mapper'
+
+module Jaxx
+  class AboutMe
+    extend ApiMapper
+
+    host "169.254.169.254"
+    base_path "/latest/meta-data"
+
+    attribute_via_path :ami_id
+    attribute_via_path :ami_launch_index
+    attribute_via_path :ami_manifest_path
+    attribute_via_path :hostname
+    attribute_via_path :instance_action
+    attribute_via_path :instance_id
+    attribute_via_path :instance_type
+    attribute_via_path :kernel_id
+    attribute_via_path :local_hostname
+    attribute_via_path :local_ipv4
+    attribute_via_path :mac
+    attribute_via_path :profile
+    attribute_via_path :public_hostname
+    attribute_via_path :public_ipv4
+    attribute_via_path :reservation_id
+    attribute_via_path :security_groups
+    attribute_via_path :az, 'placement/availability-zone'
+
+    def to_hash
+      self.class.api_attributes.inject({}) {|hsh, at| hsh[at] = send(at); hsh }
+    end
+
+    def inspect
+      self.to_hash.to_s
+    end
+
+  end
+end

data/lib/jaxx/api_mapper.rb

@@ -0,0 +1,54 @@
+require 'timeout'
+
+module Jaxx
+
+  module ApiMapper
+    
+    def self.extended klass
+      klass.extend(ClassMethods)
+      klass.class_eval { include(InstanceMethods) }
+    end
+
+    module ClassMethods
+
+      def api_attributes
+        @api_attibutes ||= []
+      end
+
+      def attribute_via_path meth, path = nil
+        path ||= meth.to_s.gsub('_', '-')
+        define_method(meth.to_sym) { make_request path }
+        api_attributes.push(meth.to_sym)
+      end
+
+      def host h = nil
+        @host = h if h
+        @host
+      end
+
+      def base_path bp = nil
+        @base_path = bp if bp
+        @base_path
+      end
+
+    end
+
+    module InstanceMethods
+
+      private
+
+      def make_request path
+        u = URI::HTTP.build :host => self.class.host, :path => full_path_for(path)
+        Timeout.timeout(1) do
+          Net::HTTP.get u.host, u.path
+        end
+      end
+
+      def full_path_for partial
+        [self.class.base_path, partial].compact.flatten.join('/').gsub('//', '/')
+      end
+
+    end
+
+  end
+end

data/lib/jaxx/cli.rb

@@ -5,13 +5,23 @@ module Jaxx
   module CLI
 
     def self.execute meth, args
-      parser.parse!(args)
-      options.empty? ? (Jaxx.logger.write(parser) and exit) : Jaxx.send(meth, options)
+
+      case meth
+      when :upload, :download
+        default_parser.parse!(args)
+        (Jaxx.logger.write(default_parser) and exit) if options.empty?
+      when :aboutme
+        aboutme_parser.parse!(args)
+        (Jaxx.logger.write(aboutme_parser) and exit) unless options['display']
+      end
+
+      Jaxx.send(meth, options)
     rescue RuntimeError => exc
+      Jaxx.logger.write "An error occurred: #{exc.message}\n"
       exit 1
     end
 
-    def self.parser 
+    def self.default_parser 
       OptionParser.new do |o|
         o.banner = "jaxx [options]"
 
@@ -19,11 +29,19 @@ module Jaxx
         o.on('-k', '--access-key [ACCESS_KEY]')         { |k| options['access_key'] = k }
         o.on('-s', '--access-secret [ACCESS_SECRET]')   { |s| options['access_secret'] = s }
         o.on('-f', '--file [FILE]')                     { |f| options['file'] = f }
-        o.on('-p', '--privacy [PRIVACY]')               { |p| options['privacy'] = p }
+        o.on('-p', '--privacy [privacy]')               { |p| options['privacy'] = p }
         o.on('-h', '--help')                            { o }
       end
     end
 
+    def self.aboutme_parser
+      OptionParser.new do |o|
+        o.banner = "jaxx-aboutme [options]"
+        o.on('-d', '--display')     { |d| options['display'] = d }
+        o.on('-h', '--help')        { o }
+      end
+    end
+
     def self.options
       @options ||= {}
     end

data/lib/jaxx/version.rb

@@ -1,3 +1,3 @@
 module Jaxx
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/lib/jaxx.rb

@@ -2,10 +2,15 @@ require "jaxx/version"
 require "jaxx/environment"
 require "jaxx/upload"
 require "jaxx/download"
+require "jaxx/about_me"
 require "logger"
 
 module Jaxx
 
+  def self.aboutme args = {}
+    Jaxx::AboutMe.new.to_hash.each {|k,v| logger.write "#{k} : #{v}" }
+  end
+
   def self.upload args = {}
     Jaxx::Upload.new(args).execute
   end

data/spec/helpers/service.rb

@@ -1,4 +1,5 @@
 require 'fakeweb'
+require 'jaxx/about_me'
 
 module ServiceHelper
 
@@ -10,4 +11,27 @@ module ServiceHelper
     })
   end
 
+  def stub_meta_request path, body
+    uri = if path.kind_of?(String)
+      URI::HTTP.build(:host => Jaxx::AboutMe.host, :path => [Jaxx::AboutMe.base_path, path].join('/'))  
+    else
+      path
+    end
+    FakeWeb.register_uri :get, uri, :body => body 
+  end
+
+  def stub_meta_request_by_method meth, body
+    path = meth.to_s.gsub('_', '-')
+    stub_meta_request path, body
+  end
+
+  def ensure_api_response meth, expected_response = "", path = nil
+    if path
+      stub_meta_request path, expected_response
+    else
+      stub_meta_request_by_method meth, expected_response
+    end
+
+    subject.send(meth).should == expected_response
+  end
 end

data/spec/lib/jaxx/aboutme_spec.rb

@@ -0,0 +1,91 @@
+require 'spec_helper'
+require 'json'
+
+module Jaxx
+  describe AboutMe do
+
+    it "#ami_id" do
+      ensure_api_response :ami_id, "ami-123"
+    end
+
+    it "#ami_launch_index" do
+      ensure_api_response :ami_id, "0"
+    end
+
+    it "#ami-manifest-path" do
+      ensure_api_response :ami_id, "manifest.xml"
+    end
+
+    it "#block-device-mapping"
+
+    it "#hostname" do
+      ensure_api_response :hostname, "ip-123-123"
+    end
+
+    it "#instance_action" do
+      ensure_api_response :instance_action, "none"
+    end
+
+    it "#instance_id" do
+      ensure_api_response :instance_id, "123"
+    end
+
+    it "#instance_type" do
+      ensure_api_response :instance_type, "m1.small"
+    end
+
+    it "#kernel_id" do
+      ensure_api_response :kernel_id, "aki-123"
+    end
+
+    it "#local_hostname" do
+      ensure_api_response :local_hostname, "ip-123"
+    end
+
+    it "#local_ipv4" do
+      ensure_api_response :local_ipv4, "127.0.0.1"
+    end
+
+    it "#mac" do
+      ensure_api_response :mac, "123-456-78"
+    end
+
+    it "#metrics"
+
+    it "#network"
+
+    it "#placement" do
+      ensure_api_response :az, "us-east-1", "placement/availability-zone"
+    end
+
+    it "#profile" do
+      ensure_api_response :profile, "default"
+    end
+
+    it "#public_hostname" do
+      ensure_api_response :public_hostname, "ec2-1223.com"
+    end
+
+    it "#public_ipv4" do
+      ensure_api_response :public_ipv4, "52.51.52.51"
+    end
+
+    it "#public_keys"
+
+    it "#reservation_id" do
+      ensure_api_response :reservation_id, "r-123"
+    end
+
+    it "#security_groups" do
+      ensure_api_response :security_groups, "default"
+    end
+
+    it "#to_hash" do
+      stub_meta_request /#{described_class.host}/, ""
+      hsh = subject.to_hash
+
+      hsh.should be_kind_of(Hash)
+      hsh.keys.should == subject.class.api_attributes
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -7,7 +7,6 @@ require 'rspec'
 
 Jaxx.logger StringIO.new
 
-
 require_relative 'helpers/service'
 
 RSpec.configure do |c|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jaxx
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-04 00:00:00.000000000 Z
+date: 2013-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -159,6 +159,7 @@ description: Command line wrapper for pushing files to S3
 email:
 - marcky.sharky@googlemail.com
 executables:
+- jaxx-aboutme
 - jaxx-download
 - jaxx-upload
 extensions: []
@@ -171,14 +172,18 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- bin/jaxx-aboutme
 - bin/jaxx-download
 - bin/jaxx-upload
+- features/about_me.feature
 - features/download.feature
 - features/step_definitions/global_steps.rb
 - features/support/env.rb
 - features/upload.feature
 - jaxx.gemspec
 - lib/jaxx.rb
+- lib/jaxx/about_me.rb
+- lib/jaxx/api_mapper.rb
 - lib/jaxx/cli.rb
 - lib/jaxx/download.rb
 - lib/jaxx/environment.rb
@@ -186,6 +191,7 @@ files:
 - lib/jaxx/upload.rb
 - lib/jaxx/version.rb
 - spec/helpers/service.rb
+- spec/lib/jaxx/aboutme_spec.rb
 - spec/lib/jaxx/download_spec.rb
 - spec/lib/jaxx/environment_spec.rb
 - spec/lib/jaxx/process_spec.rb
@@ -206,7 +212,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3593103380560459674
+      hash: 125363151703119624
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -215,7 +221,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3593103380560459674
+      hash: 125363151703119624
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
@@ -223,11 +229,13 @@ signing_key:
 specification_version: 3
 summary: RubyGems to allow any file to be pushed to S3 in the simplist way
 test_files:
+- features/about_me.feature
 - features/download.feature
 - features/step_definitions/global_steps.rb
 - features/support/env.rb
 - features/upload.feature
 - spec/helpers/service.rb
+- spec/lib/jaxx/aboutme_spec.rb
 - spec/lib/jaxx/download_spec.rb
 - spec/lib/jaxx/environment_spec.rb
 - spec/lib/jaxx/process_spec.rb