adhearsion 1.2.3 → 1.2.4

data/CHANGELOG

@@ -1,3 +1,6 @@
+1.2.4
+  - Backported Thor-based generators from Adhearsion 2 in order to escape Rubigen.
+
 1.2.3
  - Changes from 1.2.2, without an accidental API change which slipped in
 

data/adhearsion.gemspec

@@ -27,12 +27,11 @@ Gem::Specification.new do |s|
   # on the safe side.
   s.add_runtime_dependency "i18n"
   s.add_runtime_dependency "json"
-  s.add_runtime_dependency "rubigen", [">= 1.5.6"]
+  s.add_runtime_dependency "thor"
   s.add_runtime_dependency "rake"
   s.add_runtime_dependency "pry"
 
   # Development dependencies
-  s.add_development_dependency 'rubigen', [">= 1.5.6"]
   s.add_development_dependency 'rspec', [">= 2.4.0"]
   s.add_development_dependency 'flexmock'
   s.add_development_dependency 'activerecord', [">= 2.1.0"]

data/lib/adhearsion/commands.rb

@@ -91,15 +91,9 @@ USAGE
             if args.size.zero?
               raise CommandHandler::UnknownCommand.new("Must specify something to create!")
             elsif args.size == 1
-              # We're creating a project
-              path = args.first
-              require 'rubigen'
-              require 'rubigen/scripts/generate'
-              source = RubiGen::PathSource.new(:application,
-                File.join(File.dirname(__FILE__), "../../app_generators"))
-              RubiGen::Base.reset_sources
-              RubiGen::Base.append_sources source
-              RubiGen::Scripts::Generate.new.run([path], :generator => 'ahn')
+              require 'adhearsion/generators'
+              require 'adhearsion/generators/app/app_generator'
+              Adhearsion::Generators::AppGenerator.start
             elsif args.size == 2
               # We're creating a feature (e.g. a component)
               feature_type, component_name = args

data/lib/adhearsion/console.rb

@@ -9,8 +9,17 @@ module Adhearsion
       # Start the Adhearsion console
       #
       def run
-        Pry.prompt = [ proc { |obj, nest_level, pry_instance = nil| "AHN#{'  ' * nest_level}> " },
-                       proc { |obj, nest_level, pry_instance = nil| "AHN#{'  ' * nest_level}? " } ]
+        Pry.prompt = [
+                        proc do |*args|
+                          obj, nest_level, pry_instance = args
+                          "AHN#{'  ' * nest_level}> "
+                        end,
+                        proc do |*args|
+                          obj, nest_level, pry_instance = args
+                          "AHN#{'  ' * nest_level}? "
+                        end
+                      ]
+        Pry.config.command_prefix = "%"
         pry
       end
 

data/lib/adhearsion/generators.rb

@@ -0,0 +1,5 @@
+module Adhearsion
+  module Generators
+    extend ActiveSupport::Autoload
+  end
+end

data/lib/adhearsion/generators/app/app_generator.rb

@@ -0,0 +1,47 @@
+begin
+  require 'thor/group'
+rescue LoadError
+  puts "Thor is not available.\nIf you ran this command from a git checkout " \
+       "of Adhearsion, please make sure thor is installed,\nand run this command " \
+       "as `ruby #{$0} #{(ARGV | ['--dev']).join(" ")}`"
+  exit
+end
+
+module Adhearsion
+  module Generators
+    class AppGenerator < Thor::Group
+      include Thor::Actions
+
+      BASEDIRS = %w{
+        components
+        config
+        script
+      }
+
+      argument :app_action, :type => :string
+      argument :app_path,   :type => :string
+
+      def self.source_root(path = nil)
+        path = File.join(base_root, 'templates')
+        path if File.exists?(path)
+      end
+
+      def self.base_root
+        File.dirname(__FILE__)
+      end
+
+      def setup_project
+        self.destination_root = @app_path
+        BASEDIRS.each { |dir| directory dir }
+        %w{
+          .ahnrc
+          dialplan.rb
+          events.rb
+          README
+          Rakefile
+          Gemfile
+        }.each { |file| copy_file file }
+      end
+    end
+  end
+end

data/{app_generators/ahn → lib/adhearsion/generators/app}/templates/Gemfile

@@ -1,6 +1,6 @@
 source "http://rubygems.org"
 
-gem "adhearsion", ">= 1.2.1"
+gem "adhearsion", ">= 1.2.4"
 
 #
 # Here are some example components you might like to use. Simply

data/lib/adhearsion/version.rb

@@ -2,7 +2,7 @@ module Adhearsion #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 1 unless defined? MAJOR
     MINOR = 2 unless defined? MINOR
-    TINY  = 3 unless defined? TINY
+    TINY  = 4 unless defined? TINY
 
     STRING = [MAJOR, MINOR, TINY].join('.') unless defined? STRING
   end

data/spec/adhearsion/cli_spec.rb

@@ -264,7 +264,6 @@ describe 'The "create" command' do
     the_following_code {
       tmp_path = new_tmp_dir
       simulate_args "create", tmp_path
-      RubiGen::Base.default_options.merge! :quiet => true
       # capture_stdout { Adhearsion::CLI::AhnCommand.execute! }
       execute_ahn_command
       File.exists?(File.join(tmp_path, ".ahnrc")).should be true

data/spec/spec_helper.rb

@@ -26,7 +26,6 @@ $: << File.dirname(__FILE__)
   bundler/setup
   flexmock/rspec
   active_support
-  rubigen
   pp
   stringio
   adhearsion

data/spec/support/initializer_stubs.rb

@@ -1,6 +1,6 @@
 module InitializerStubs
   DEFAULT_AHNRC_DATA_STRUCTURE = YAML.load_file(
-    File.dirname(__FILE__) + "/../../app_generators/ahn/templates/.ahnrc"
+    File.dirname(__FILE__) + "/../../lib/adhearsion/generators/app/templates/.ahnrc"
   ) unless defined? DEFAULT_AHNRC_DATA_STRUCTURE
 
   UNWANTED_BEHAVIOR = {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adhearsion
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -12,11 +12,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-18 00:00:00.000000000 Z
+date: 2012-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2153249240 !ruby/object:Gem::Requirement
+  requirement: &2152387620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,10 @@ dependencies:
         version: 1.0.10
   type: :runtime
   prerelease: false
-  version_requirements: *2153249240
+  version_requirements: *2152387620
 - !ruby/object:Gem::Dependency
   name: log4r
-  requirement: &2153248640 !ruby/object:Gem::Requirement
+  requirement: &2152387100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,10 +35,10 @@ dependencies:
         version: 1.0.5
   type: :runtime
   prerelease: false
-  version_requirements: *2153248640
+  version_requirements: *2152387100
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2160508360 !ruby/object:Gem::Requirement
+  requirement: &2152386600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -46,10 +46,10 @@ dependencies:
         version: 2.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2160508360
+  version_requirements: *2152386600
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2160507740 !ruby/object:Gem::Requirement
+  requirement: &2152386200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -57,10 +57,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160507740
+  version_requirements: *2152386200
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2160506720 !ruby/object:Gem::Requirement
+  requirement: &2152385680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -68,21 +68,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160506720
+  version_requirements: *2152385680
 - !ruby/object:Gem::Dependency
-  name: rubigen
-  requirement: &2160505340 !ruby/object:Gem::Requirement
+  name: thor
+  requirement: &2152385260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.5.6
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160505340
+  version_requirements: *2152385260
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2160504180 !ruby/object:Gem::Requirement
+  requirement: &2152384840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -90,10 +90,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160504180
+  version_requirements: *2152384840
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &2160500800 !ruby/object:Gem::Requirement
+  requirement: &2152384380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -101,21 +101,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160500800
-- !ruby/object:Gem::Dependency
-  name: rubigen
-  requirement: &2160498080 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.5.6
-  type: :development
-  prerelease: false
-  version_requirements: *2160498080
+  version_requirements: *2152384380
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2160496140 !ruby/object:Gem::Requirement
+  requirement: &2152383840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -123,10 +112,10 @@ dependencies:
         version: 2.4.0
   type: :development
   prerelease: false
-  version_requirements: *2160496140
+  version_requirements: *2152383840
 - !ruby/object:Gem::Dependency
   name: flexmock
-  requirement: &2160494480 !ruby/object:Gem::Requirement
+  requirement: &2152383380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -134,10 +123,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160494480
+  version_requirements: *2152383380
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2160493320 !ruby/object:Gem::Requirement
+  requirement: &2152382820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -145,10 +134,10 @@ dependencies:
         version: 2.1.0
   type: :development
   prerelease: false
-  version_requirements: *2160493320
+  version_requirements: *2152382820
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2160491920 !ruby/object:Gem::Requirement
+  requirement: &2152382360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -156,10 +145,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160491920
+  version_requirements: *2152382360
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2160491240 !ruby/object:Gem::Requirement
+  requirement: &2152381860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -167,10 +156,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160491240
+  version_requirements: *2152381860
 - !ruby/object:Gem::Dependency
   name: simplecov-rcov
-  requirement: &2160490120 !ruby/object:Gem::Requirement
+  requirement: &2152381440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -178,10 +167,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160490120
+  version_requirements: *2152381440
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: &2160488600 !ruby/object:Gem::Requirement
+  requirement: &2152397320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -189,7 +178,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160488600
+  version_requirements: *2152397320
 description: Adhearsion is an open-source telephony development framework
 email: dev&Adhearsion.com
 executables:
@@ -208,26 +197,6 @@ files:
 - README.markdown
 - Rakefile
 - adhearsion.gemspec
-- app_generators/ahn/USAGE
-- app_generators/ahn/ahn_generator.rb
-- app_generators/ahn/templates/.ahnrc
-- app_generators/ahn/templates/Gemfile
-- app_generators/ahn/templates/README
-- app_generators/ahn/templates/Rakefile
-- app_generators/ahn/templates/components/ami_remote/ami_remote.rb
-- app_generators/ahn/templates/components/disabled/HOW_TO_ENABLE
-- app_generators/ahn/templates/components/disabled/stomp_gateway/README.markdown
-- app_generators/ahn/templates/components/disabled/stomp_gateway/stomp_gateway.rb
-- app_generators/ahn/templates/components/disabled/stomp_gateway/stomp_gateway.yml
-- app_generators/ahn/templates/components/disabled/xmpp_gateway/README.markdown
-- app_generators/ahn/templates/components/disabled/xmpp_gateway/xmpp_gateway.rb
-- app_generators/ahn/templates/components/disabled/xmpp_gateway/xmpp_gateway.yml
-- app_generators/ahn/templates/components/simon_game/simon_game.rb
-- app_generators/ahn/templates/config/environment.rb
-- app_generators/ahn/templates/config/startup.rb
-- app_generators/ahn/templates/dialplan.rb
-- app_generators/ahn/templates/events.rb
-- app_generators/ahn/templates/script/ahn
 - bin/ahn
 - bin/ahnctl
 - bin/jahn
@@ -253,6 +222,27 @@ files:
 - lib/adhearsion/foundation/string.rb
 - lib/adhearsion/foundation/synchronized_hash.rb
 - lib/adhearsion/foundation/thread_safety.rb
+- lib/adhearsion/generators.rb
+- lib/adhearsion/generators/app/USAGE
+- lib/adhearsion/generators/app/app_generator.rb
+- lib/adhearsion/generators/app/templates/.ahnrc
+- lib/adhearsion/generators/app/templates/Gemfile
+- lib/adhearsion/generators/app/templates/README
+- lib/adhearsion/generators/app/templates/Rakefile
+- lib/adhearsion/generators/app/templates/components/ami_remote/ami_remote.rb
+- lib/adhearsion/generators/app/templates/components/disabled/HOW_TO_ENABLE
+- lib/adhearsion/generators/app/templates/components/disabled/stomp_gateway/README.markdown
+- lib/adhearsion/generators/app/templates/components/disabled/stomp_gateway/stomp_gateway.rb
+- lib/adhearsion/generators/app/templates/components/disabled/stomp_gateway/stomp_gateway.yml
+- lib/adhearsion/generators/app/templates/components/disabled/xmpp_gateway/README.markdown
+- lib/adhearsion/generators/app/templates/components/disabled/xmpp_gateway/xmpp_gateway.rb
+- lib/adhearsion/generators/app/templates/components/disabled/xmpp_gateway/xmpp_gateway.yml
+- lib/adhearsion/generators/app/templates/components/simon_game/simon_game.rb
+- lib/adhearsion/generators/app/templates/config/environment.rb
+- lib/adhearsion/generators/app/templates/config/startup.rb
+- lib/adhearsion/generators/app/templates/dialplan.rb
+- lib/adhearsion/generators/app/templates/events.rb
+- lib/adhearsion/generators/app/templates/script/ahn
 - lib/adhearsion/host_definitions.rb
 - lib/adhearsion/initializer.rb
 - lib/adhearsion/initializer/asterisk.rb
@@ -377,7 +367,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4207106213381902731
+      hash: 2749044386952630171
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -386,7 +376,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4207106213381902731
+      hash: 2749044386952630171
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10

data/app_generators/ahn/ahn_generator.rb

@@ -1,89 +0,0 @@
-class AhnGenerator < RubiGen::Base
-
-  DEFAULT_SHEBANG = File.join(Config::CONFIG['bindir'],
-                              Config::CONFIG['ruby_install_name'])
-
-  default_options :author => nil
-
-  attr_reader :name, :component
-
-  def initialize(runtime_args, runtime_options = {})
-    super
-    usage if args.empty?
-    @destination_root = File.expand_path(args.shift)
-    @name = base_name
-    @component = 'simon_game'
-    extract_options
-  end
-
-  def manifest
-    record do |m|
-      # Ensure appropriate folder(s) exists
-      m.directory ''
-      BASEDIRS.each { |path| m.directory path }
-
-      m.file  *[".ahnrc"]*2
-
-      m.file  *["components/simon_game/simon_game.rb"]*2
-      m.file  *["components/ami_remote/ami_remote.rb"]*2
-
-      m.file  *["components/disabled/xmpp_gateway/xmpp_gateway.rb"]*2
-      m.file  *["components/disabled/xmpp_gateway/xmpp_gateway.yml"]*2
-      m.file  *["components/disabled/xmpp_gateway/README.markdown"]*2
-
-      m.file  *["components/disabled/stomp_gateway/stomp_gateway.rb"]*2
-      m.file  *["components/disabled/stomp_gateway/stomp_gateway.yml"]*2
-      m.file  *["components/disabled/stomp_gateway/README.markdown"]*2
-
-      m.file  *["config/environment.rb"]*2
-      m.file  *["config/startup.rb"]*2
-      m.file  *["dialplan.rb"]*2
-      m.file  *["events.rb"]*2
-      m.file  *["README"]*2
-      m.file  *["Rakefile"]*2
-      m.file  *["Gemfile"]*2
-      m.file  *["script/ahn"]*2
-
-      # m.dependency "install_rubigen_scripts", [destination_root, 'ahn', 'adhearsion', 'test_spec'],
-      #   :shebang => options[:shebang], :collision => :force
-    end
-  end
-
-  protected
-    def banner
-      <<-EOS
-Creates a ...
-
-USAGE: #{spec.name} name"
-EOS
-    end
-
-    def add_options!(opts)
-      opts.separator ''
-      opts.separator 'Options:'
-      # For each option below, place the default
-      # at the top of the file next to "default_options"
-      # opts.on("-a", "--author=\"Your Name\"", String,
-      #         "Some comment about this option",
-      #         "Default: none") { |options[:author]| }
-      opts.on("-v", "--version", "Show the #{File.basename($0)} version number and quit.")
-    end
-
-    def extract_options
-      # for each option, extract it into a local variable (and create an "attr_reader :author" at the top)
-      # Templates can access these value via the attr_reader-generated methods, but not the
-      # raw instance variable value.
-      # @author = options[:author]
-    end
-
-    # Installation skeleton.  Intermediate directories are automatically
-    # created so don't sweat their absence here.
-    BASEDIRS = %w(
-      components/simon_game
-      components/disabled/stomp_gateway
-      components/disabled/xmpp_gateway
-      components/ami_remote
-      config
-      script
-    )
-end