ampt 0.2.0.pre1 → 0.2.0.pre2

data/Rakefile

@@ -7,14 +7,14 @@ begin
   Jeweler::Tasks.new do |gem|
     gem.name = "ampt"
     gem.version = Ampt::VERSION
-    gem.summary = %Q{Ampt is a command line client for the Acoustics Media Player (amp).}
-    gem.description = %Q{This is a command line client for the Acoustics Media Player (amp).
-Amp is available here: http://www.github.com/avuserow/amp
-
-This is a work in progress.}
+    gem.summary = %Q{acoustics media player command line client}
+    gem.description = %Q{This is a command line client for the Acoustics Media Player (amp).}
     gem.email = "rich@interhacktive.com"
     gem.homepage = "http://github.com/capslock/ampt"
     gem.authors = ["Rich"]
+    gem.add_dependency 'curb'
+    gem.add_dependency 'trollop'
+    gem.add_dependency 'json'
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/ampt.gemspec

@@ -5,16 +5,13 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ampt}
-  s.version = "0.2.0.pre1"
+  s.version = "0.2.0.pre2"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rich"]
-  s.date = %q{2010-01-08}
+  s.date = %q{2010-01-09}
   s.default_executable = %q{ampt}
-  s.description = %q{This is a command line client for the Acoustics Media Player (amp).
-Amp is available here: http://www.github.com/avuserow/amp
-
-This is a work in progress.}
+  s.description = %q{This is a command line client for the Acoustics Media Player (amp).}
   s.email = %q{rich@interhacktive.com}
   s.executables = ["ampt"]
   s.extra_rdoc_files = [
@@ -22,8 +19,7 @@ This is a work in progress.}
      "README.rdoc"
   ]
   s.files = [
-    ".autotest",
-     ".document",
+    ".document",
      ".gitignore",
      "LICENSE",
      "README.rdoc",
@@ -40,7 +36,7 @@ This is a work in progress.}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.5}
-  s.summary = %q{Ampt is a command line client for the Acoustics Media Player (amp).}
+  s.summary = %q{acoustics media player command line client}
   s.test_files = [
     "test/helper.rb",
      "test/test_ampt.rb"
@@ -51,9 +47,18 @@ This is a work in progress.}
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<curb>, [">= 0"])
+      s.add_runtime_dependency(%q<trollop>, [">= 0"])
+      s.add_runtime_dependency(%q<json>, [">= 0"])
     else
+      s.add_dependency(%q<curb>, [">= 0"])
+      s.add_dependency(%q<trollop>, [">= 0"])
+      s.add_dependency(%q<json>, [">= 0"])
     end
   else
+    s.add_dependency(%q<curb>, [">= 0"])
+    s.add_dependency(%q<trollop>, [">= 0"])
+    s.add_dependency(%q<json>, [">= 0"])
   end
 end
 

data/lib/ampt.rb

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'trollop'
 
 module Ampt
-    VERSION = '0.2.0.pre1'
+    VERSION = '0.2.0.pre2'
     # This is the module that holds the API for the current music player. Defined in
     # ampt_api/acoustics.rb
     module API
@@ -10,9 +10,22 @@ module Ampt
 
     # The typical entry point for an Ampt app. Configures a new instance of ampt
     # using the specified block, and runs that configuration.
-    def self.init args = ARGV, *a, &b
+    def self.init args = ARGV.dup, *a, &b
         @c = Config.new(*a, &b)
-        @c.run(ARGV)
+        @c.run(args)
+    end
+
+    # Class to hold all of the user-defined functions and variables
+    module User
+        def self.parent_config=(p)
+            p.public_methods(false).each do |m|
+                (class << self; self; end).class_eval do
+                    define_method m do |*args, &b|
+                        p.send m, *args, &b
+                    end
+                end
+            end
+        end
     end
 
     # Class containing all of the configuration details for Ampt.
@@ -31,6 +44,10 @@ module Ampt
             @extras.send(s, *a, &b)
         end
 
+        def user
+            @extras
+        end
+
         # Specify a file path from which to load the config from. If a relative path 
         # is provided, the path is taken as relative to the Ampt library directory.
         def load_config file
@@ -45,31 +62,14 @@ module Ampt
             # from the user's .amptrc, which may not exist.
             begin
                 File.open(name, 'r') do |f|
-                    # There used to be more code here, and it used to be more of a hack.
-                    # Now, it's robust to multiple instances of Ampt, and doesn't require
-                    # that ugly Ampt::Config::Extra nonsense; neither here, nor in the
-                    # config file. Yes, I am an hero.
-                    # This is the heart of the operation. It reads the config file into
-                    # an anonymous object of anonymous class (what kind of trickery...).
-                    # From there, it saves that object into this configuration object
-                    # that we're in, also passing a reference to itself into the object,
-                    # so that we can continue our trickery from there.
+                    # Create a new copy of the User module for holding our
+                    # user-defined methods and variables.
                     unless @extras
-                        @extras = Class.new.new
-                        @extras.instance_variable_set '@__p__', self
-                    end
-                    # Now that we have an object, we can use it to store any user-defined
-                    # functions in the config, and have it forward to us anything that it
-                    # isn't aware of (i.e., all of those pesky command definitions).
-                    @extras.class.send(:define_method, :method_missing) do |s, *a, &b|
-                        begin
-                            @__p__.send(s, *a, &b)
-                        rescue e
-                            super
-                        end
+                        @extras = User.dup
+                        @extras.parent_config = self
                     end
-                    # Finally, we can read in the configuration file.
-                    @extras.instance_eval(f.read)
+                    # Read in the configuration file.
+                    @extras.module_eval(f.read)
                 end
             rescue Errno::ENOENT => e
             end
@@ -79,7 +79,7 @@ module Ampt
                 begin
                     require @api
                 rescue
-                    puts "Couldn't load API #{@api}"
+                    $stderr.puts "Couldn't load API #{@api}"
                     exit
                 end
             else
@@ -123,7 +123,7 @@ module Ampt
 
         # Run the config. Usually not called manually.
         def run args
-            Trollop::options args, [@commands, @alias] do |cmds, *args|
+            Trollop::options args, [@commands, @alias] do |cmds, *a|
                 commands, aliases = cmds
                 banner "Usage ampt [command] [options] [args]"
                 banner "\nCommands include:\n"
@@ -136,14 +136,15 @@ module Ampt
                 # Stop parsing if we reach a command
                 stop_on(commands.keys + aliases.keys)
             end
-            cmd = ARGV.shift
+            cmd = args.shift
             # Try to figure out if it's an alias or a command or nothing or invalid
             if @commands[cmd]
-                @commands[cmd].run(ARGV)
+                @commands[cmd].run(args)
             elsif @alias[cmd]
-                until @alias[cmd].nil?
-                    cmd = @alias[cmd]
-                end
+                begin
+                    cmd, *a = @alias[cmd].split(' ')
+                    args = a + args
+                end until @alias[cmd].nil?
                 @commands[cmd].run(ARGV)
             elsif cmd.nil? and not @default.nil?
                 @commands[@default].run(ARGV)
@@ -171,7 +172,6 @@ module Ampt
         # Create a new command. This is usually not called directly; it is invoked by
         # Ampt::Config::on_run.
         def initialize config, name, &b
-            @config    = config
             @name      = name
             @desc      = []
             @arg       = ['']
@@ -179,15 +179,10 @@ module Ampt
             @conflicts = []
             @depends   = []
             @on_run    = lambda {}
-            cloaker(&b).bind(self).call
-        end
-
-        def method_missing s, *a, &b
-            begin
-                @config.extras(s, *a, &b)
-            rescue
-                super
+            (class << self; self; end).instance_eval do
+                include config.user
             end
+            cloaker(&b).bind(self).call
         end
 
         # Specify that a command takes an argument without flags. This is only used

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ampt
 version: !ruby/object:Gem::Version 
-  version: 0.2.0.pre1
+  version: 0.2.0.pre2
 platform: ruby
 authors: 
 - Rich
@@ -9,15 +9,40 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-08 00:00:00 -06:00
+date: 2010-01-09 00:00:00 -06:00
 default_executable: ampt
-dependencies: []
-
-description: |-
-  This is a command line client for the Acoustics Media Player (amp).
-  Amp is available here: http://www.github.com/avuserow/amp
-  
-  This is a work in progress.
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: curb
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: trollop
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: json
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+description: This is a command line client for the Acoustics Media Player (amp).
 email: rich@interhacktive.com
 executables: 
 - ampt
@@ -27,7 +52,6 @@ extra_rdoc_files:
 - LICENSE
 - README.rdoc
 files: 
-- .autotest
 - .document
 - .gitignore
 - LICENSE
@@ -67,7 +91,7 @@ rubyforge_project:
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: Ampt is a command line client for the Acoustics Media Player (amp).
+summary: acoustics media player command line client
 test_files: 
 - test/helper.rb
 - test/test_ampt.rb

data/.autotest

@@ -1,23 +0,0 @@
-# -*- ruby -*-
-
-require 'autotest/restart'
-
-# Autotest.add_hook :initialize do |at|
-#   at.extra_files << "../some/external/dependency.rb"
-#
-#   at.libs << ":../some/external"
-#
-#   at.add_exception 'vendor'
-#
-#   at.add_mapping(/dependency.rb/) do |f, _|
-#     at.files_matching(/test_.*rb$/)
-#   end
-#
-#   %w(TestA TestB).each do |klass|
-#     at.extra_class_map[klass] = "test/test_misc.rb"
-#   end
-# end
-
-# Autotest.add_hook :run_command do |at|
-#   system "rake build"
-# end