clinode 1.0.2 → 1.0.3

data/README.txt

@@ -21,3 +21,5 @@ linode stackscript download [--dir=<dir>]
 linode stackscript upload [-dir=<dir>]
   - Uploads all files in the format <stackscript_id>.stack.sh in the current directory or a directory of your choosing onto linode.
 
+Note: I'm still trying to find the best and cleanest way to implement it. All a spike so far.
+If you use it, best to read the code to figure this out and fork and pull.

data/clinode.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.executables     = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths   = ["lib"]
 
-  s.add_dependency  "linode"
+  s.add_dependency  "linode", "~> 0.7.1"
   s.add_dependency "text-hyphen", "1.0.0"
   s.add_dependency "text-format", "1.0.0"
   s.add_dependency "highline", "~> 1.5.1"

data/lib/clinode/version.rb

@@ -1,3 +1,3 @@
 module Clinode
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

data/lib/commands/avail.rb

@@ -1,7 +1,5 @@
 command :avail do |args|
-  helper.linode_config
-  ls = helper.linode
-  return if !ls
+  ls = helper.get_linode
 
   params = {}
 

data/lib/commands/dns.rb

@@ -1,7 +1,5 @@
 command :dns do |args|
-  helper.linode_config
-  ls = helper.stackscript_linode
-  return if !ls
+  ls = helper.get_linode
 
   params = {}
 
@@ -16,9 +14,7 @@ command :dns do |args|
 end
 
 command :dns_resource do |args|
-  helper.linode_config
-  ls = helper.stackscript_linode
-  return if !ls
+  ls = helper.get_linode
 
   return if !options.has_key?(:domainid)
 

data/lib/commands/echo.rb

@@ -1,7 +1,5 @@
 command :echo do
-  helper.linode_config
-  ls = helper.stackscript_linode
-  return if !ls
+  ls = helper.get_linode
 
   puts ls.test.echo(options)
 end

data/lib/commands/helpers.rb

@@ -17,12 +17,6 @@ end
 
 helper :get_linode do
 
-  linode_config
-  ls = stackscript_linode
-  if ls
-    return ls
-  else
-    die "wtf"
-  end
+  linode or die "wtf"
 
 end

data/lib/commands/nodebalancer.rb

@@ -1,7 +1,5 @@
 command :nodebalancer do |args|
-  helper.linode_config
-  ls = helper.stackscript_linode
-  return if !ls
+  ls = helper.get_linode
 
   case args
   when "list"

data/lib/commands/stackscript.rb

@@ -1,8 +1,3 @@
-# This shouldnt be required if we get the patch into rick's linode api gem
-helper :stackscript_linode do
-  Linode::Stackscript.new(:api_key => Clinode.options[:api_token])
-end
-
 helper :print_stackscript do |script|
   if Clinode.options[:output]
     puts script.script
@@ -80,9 +75,7 @@ flags :update => "Update the content of the stackscript"
 flags :meta_update => "Update the meta data of the stackscript"
 flags :delete => "Delete the given stack script"
 command :stackscript do |arg|
-  helper.linode_config
-  ls = helper.stackscript_linode
-  return if !ls
+  ls = helper.get_linode
 
   options[:dir] ||= "."
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: clinode
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 1
   - 0
-  - 2
-  version: 1.0.2
+  - 3
+  version: 1.0.3
 platform: ruby
 authors: 
 - Aditya Sanghi
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-16 00:00:00 Z
+date: 2011-07-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: linode
@@ -23,12 +23,14 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 1
         segments: 
         - 0
-        version: "0"
+        - 7
+        - 1
+        version: 0.7.1
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency