Devops 0.0.5 → 0.0.6

data/bin/ops

@@ -9,26 +9,33 @@ end
 bootstrap_files = [
   File.join( 'tasks', 'init.rb' ) ]
 
-Rake.application.init( File.basename( $0 ) )
+Dir.chdir Ops::pwd_dir do
 
-begin
-  bootstrap_files.each do | f |
-    File.join Ops::root_dir, f
-    require f
+  unless Ops::pwd_dir == Dir.pwd
+    puts "Executing from ( #{ Ops::pwd_dir } )".warning
   end
-rescue => e
-  puts e
-end
 
-bootstrap_files.each do | f |
-  f = File.join Ops::pwd_dir, f
-  require f if File.exists? f
-end
+  Rake.application.init( File.basename( $0 ) )
+
+  begin
+    bootstrap_files.each do | f |
+      File.join Ops::root_dir, f
+      require f
+    end
+  rescue => e
+    puts e
+  end
 
-begin
-  Rake.application.top_level
-rescue => e
-  puts "Failed to call task: #{ e.message }"
+  bootstrap_files.each do | f |
+    f = File.join Ops::pwd_dir, f
+    require f if File.exists? f
+  end
+
+  begin
+    Rake.application.top_level
+  rescue => e
+    puts "Failed to call task: #{ e.message }"
+  end
 end
 
 exit

data/lib/ops/common.rb

@@ -6,7 +6,10 @@ module Ops
   end
 
   def self.pwd_dir
-    Dir.pwd
+    Pathname.new( Dir.pwd ).ascend do | p |
+      return p if File.exists? File.join( p, 'config.json' )
+    end 
+    nil
   end
 
   def self.has_bash?

data/lib/ops/console.rb

@@ -50,4 +50,8 @@ class String
   def error
     replace Color.print( self , [ :bold, :red ] )
   end
+
+  def warning
+    replace Color.print( self , [ :bold, :yellow ] )
+  end
 end

data/lib/tasks/hosts.rb

@@ -21,7 +21,17 @@ namespace "hosts" do
     host = ENV[ 'host' ]
     user = ENV[ 'user' ]
     type = ENV[ 'type' ] || "default"
-    identity = File.basename( ENV[ 'identity' ] )
+    identity = nil
+    tags = {}
+
+    unless ENV[ 'identity' ].nil?
+      identity = File.basename( ENV[ 'identity' ] )
+    end
+
+    unless ENV[ 'tags' ].nil?
+      tags = File.basename( ENV[ 'tags' ] )
+      tags = JSON.parse( tags )
+    end
 
 
     puts "Adding host: #{ host }"
@@ -31,7 +41,9 @@ namespace "hosts" do
     hosts = {}
     hosts_file = File.join( pwd, "hosts.json" )
 
-    hosts = Ops::read_hosts
+    if File.exists? hosts_file
+      hosts = JSON.parse( File.read( hosts_file ) )
+    end
 
     exit_failure( "Error: #{ host } is already defined" ) if
       hosts.has_key? host
@@ -40,7 +52,8 @@ namespace "hosts" do
       'HostName' => hostname,
       'User' => user,
       'IdentityFile' => identity,
-      "Type" => "type"
+      "Type" => "type",
+      "Tags" => tags
     }
     
     File.open( hosts_file, 'w' ) { | f | f.write( hosts.to_json ) }

data/lib/tasks/ops.rb

@@ -1,6 +1,5 @@
 task "default" do
-  Rake.application.options.show_task_pattern = //
-  Rake.application.display_tasks_and_comments()
+  puts "run ops -T for a full list of commands"
 end
 
 desc I18n.t( "ops.version.desc" )

data/lib/version.rb

@@ -1,6 +1,6 @@
 module Ops
 
   def self.version
-    "0.0.5"
+    "0.0.6"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: Devops
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-08 00:00:00.000000000 Z
+date: 2013-04-29 00:00:00.000000000 Z
 dependencies: []
 description: Ops tool for remote servers
 email: hardeepshoker@gmail.com
@@ -43,8 +43,8 @@ files:
 - res/samples/default/config.json
 - res/strings/strings.yml
 - res/strings/tasks/hosts.yml
-- spec/lib/host/default.rb
-- spec/lib/host/list.rb
+- spec/lib/host/default_spec.rb
+- spec/lib/host/list_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/hardeep/ops
 licenses: []