Floppy-amee 0.0.5 → 0.1.0

data/bin/ameesh

@@ -2,4 +2,28 @@
 
 irb_name = RUBY_PLATFORM =~ /mswin32/ ? 'irb.bat' : 'irb'
 
-exec "#{irb_name} -r rubygems -r amee/shell --simple-prompt"
+require 'optparse'
+# Command-line options - get username, password, and server
+options = {}
+OptionParser.new do |opts|
+  opts.on("-u USERNAME", "AMEE username") do |u|
+    options[:username] = u
+  end
+  opts.on("-p PASSWORD", "AMEE password") do |p|
+    options[:password] = p
+  end
+  opts.on("-s SERVER", "AMEE server") do |s|
+    options[:server] = s
+  end
+end.parse!
+
+# Set environment variables for irb
+ENV['AMEE_SERVER'] = options[:server]
+ENV['AMEE_USERNAME'] = options[:username]
+ENV['AMEE_PASSWORD'] = options[:password]
+
+if options[:server].nil? || options[:username].nil? || options[:password].nil?
+  puts "Please provide connection details. Run 'ameesh --help' for details."
+else
+  exec "#{irb_name} -r rubygems -r amee/shell --simple-prompt"
+end

data/lib/amee.rb

@@ -10,8 +10,8 @@ module AMEE
   
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 0
-    TINY  = 5
+    MINOR = 1
+    TINY  = 0
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
   

data/lib/amee/shell.rb

@@ -13,56 +13,59 @@ module AMEE
     end
     
     def ls
-      "listing contents of #{@@category}"
+      puts "Categories:"
+      @@category.children.each do |c|
+        puts " - #{c[:path]}"
+      end
+      puts "Items:"
+      @@category.items.each do |i|
+        puts " - #{i[:path]} (#{i[:label]})"
+      end
+      nil
     end
     
     def pwd
-      @@category
+      @@category.full_path
     end
     
     def cd(path)
       if path == '..'
-        path_components = @@category.split('/')
+        path_components = @@category.full_path.split('/')
         path = path_components.first(path_components.size - 1).join('/')
-      elsif !path.match /^\/.*/
-        path = @@category + '/' + path
+      elsif !path.match(/^\/.*/)
+        path = @@category.full_path + '/' + path
       end
-      @@category = path
+      @@category = AMEE::Data::Category.get($connection, path)
+      @@category.full_path
     end
     
-    def cat(object)
-      "displaying contents of #{@@category}/#{object}"
+    def cat(name)
+      item = @@category.items.detect { |i| i[:path].match("^#{name}") }
+      fullpath = "#{@@category.full_path}/#{item[:path]}"
+      item = AMEE::Data::Item.get($connection, fullpath)
+      puts fullpath
+      puts "Label: #{item.label}"
+      puts "Values:"
+      item.values.each do |v|
+        puts " - #{v[:name]}: #{v[:value]}"
+      end
+      nil
     end
     
   end
 end
 
 require 'amee'
-require 'optparse'
 include AMEE::Shell
 
-# Command-line options - get username, password, and server
-options = {}
-OptionParser.new do |opts|
-  opts.on("-u", "--username USERNAME", "AMEE username") do |u|
-    options[:username] = u
-  end  
-  opts.on("-p", "--password PASSWORD", "AMEE password") do |p|
-    options[:password] = p
-  end
-  opts.on("-s", "--server SERVER", "AMEE server") do |s|
-    options[:server] = s
-  end
-end.parse!
-
-# Connect
-connection = AMEE::Connection.new(options[:server], options[:username], options[:password])
+# Set up connection
+$connection = AMEE::Connection.new(ENV['AMEE_SERVER'], ENV['AMEE_USERNAME'], ENV['AMEE_PASSWORD'])
 
-if connection.valid?
+if $connection.valid?
   # Change to root of data api to get going
   cd '/data'
   # Display AMEE details
-  amee_help  
+  amee_help
 else
   puts "Can't connect to AMEE - please check details"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: Floppy-amee
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  version: 0.1.0
 platform: ruby
 authors: 
 - James Smith
@@ -9,14 +9,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-11 00:00:00 -07:00
+date: 2008-07-20 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
 description: 
 email: james@floppy.org.uk
-executables: []
-
+executables: 
+- ameesh
 extensions: []
 
 extra_rdoc_files: []