gm 0.1.4 → 0.1.5

data/gm_behaviors/github_behavior.rb

@@ -2,7 +2,10 @@
 class GithubBehavior < GM::Behavior
   
   def run
-    if GM::App.emulate? and config[:github][:emulate]
+    emulate  = !command.options.no_emulation?
+    emulate &= (config[:github] != nil) && (config[:github][:emulate] == true)
+    
+    if emulate
       name = config[:github][:project] || config[:general][:name]
       spec.name = "#{config[:github][:username]}-#{name}"
     end

data/gm_commands/build_command.rb

@@ -7,7 +7,7 @@ class BuildCommand < GM::Command
     build a gem and put the result in pkg/
   DOC
   
-  def extra_options(p)
+  def add_options(p)
     p.flag 'E', 'no-emulation', :desc => 'Don\'t emulate any network'
   end
   
@@ -15,11 +15,11 @@ class BuildCommand < GM::Command
     GM::Command.run(:build_gemspec, [(options.no_emulation? ? '-E' : nil)].compact)
     
     app.info "Building your gem..."
-    builder = Gem::Builder.new app.gemspec
-    app.gem_file_name = builder.build
-    sh("rm -f pkg/#{app.gem_file_name}",
+    builder = Gem::Builder.new app.spec
+    builder.build
+    sh("rm -f pkg/#{gem_file_name}",
        "mkdir -p pkg",
-       "mv #{app.gem_file_name} pkg/")
+       "mv #{gem_file_name} pkg/")
   end
   
 end

data/gm_commands/build_gemspec_command.rb

@@ -1,17 +1,16 @@
 
 class BuildGemspecCommand < GM::Command
   
-  def extra_options(p)
+  def add_options(p)
     p.flag 'E', 'no-emulation', :desc => 'Don\'t emulate any network'
   end
   
   def run
     app.info "Generating your gemspec..."
-    app.emulate = !options.no_emulation?
-    app.gemspec = Gem::Specification.new
     
     GM::Behavior.behaviors.each do |name,klass|
       behavior = klass.new
+      behavior.command = self
       behavior.run
     end
     

data/gm_commands/config_command.rb

@@ -35,7 +35,7 @@ EOC
   end
   
   def run_show
-    GM::Command.run(:build_gemspec)
+    GM::Command.run(:build_gemspec, ['-E'])
     puts config.to_yaml
   end
   

data/gm_commands/gen_command.rb

@@ -20,7 +20,7 @@ class GenCommand < GM::Command
   DOC
   
   def run
-    GM::Command.run(:build_gemspec) if File.exist?('./Gmfile')
+    GM::Command.run(:build_gemspec, ['-E']) if File.exist?('./Gmfile')
     @gen_name    = self.argv.shift
     @gen_options = self.argv
     

data/gm_commands/help_command.rb

@@ -135,7 +135,7 @@ class HelpCommand < GM::Command
   def doc_command(command)
     options = Clip { |p|
       p.banner = command.banner_text
-      command.new.extra_options(p)
+      command.new.options(p)
     }.to_s
     options.gsub!(/Usage:\n/, '')
     %{

data/gm_commands/install_command.rb

@@ -11,7 +11,7 @@ class InstallCommand < GM::Command
     GM::Command.run(:build)
     
     app.info "Installing your gem..."
-    sh("sudo gem install pkg/#{app.gem_file_name}")
+    sh("sudo gem install pkg/#{gem_file_name}")
   end
   
 end

data/gm_commands/publish_command.rb

@@ -11,9 +11,10 @@ class PublishCommand < GM::Command
   DOC
   
   def run
-    GM::Command.run(:build_gemspec)
     
     networks = argv.collect do |network|
+      app.reset_spec!
+      GM::Command.run(:build_gemspec, ['-E'])
       name  = network.underscore.to_sym
       klass = GM::Network.networks[name]
       klass.new unless klass.nil?

data/gm_commands/spec_command.rb

@@ -4,10 +4,10 @@ class SpecCommand < GM::Command
   desc "Dump the gemspec file."
   
   def run
-    GM::Command.run(:build_gemspec)
+    GM::Command.run(:build_gemspec, ['-E'])
     app.info "Writing your gemspec..."
-    File.open("#{app.gemspec.name}.gemspec", 'w+') do |f|
-      f.write app.gemspec.to_ruby
+    File.open("#{app.spec.name}.gemspec", 'w+') do |f|
+      f.write app.spec.to_ruby
     end
   end
   

data/gm_networks/github_network.rb

@@ -61,7 +61,7 @@ class GithubNetwork < GM::Network
   def commit_gemspec
     version = config[:general][:version]
     GM::Command.run(:spec)
-    sh %{ git ci -m "Bumped to version #{version}" -o "#{app.gemspec.name}.gemspec" -o "Gmfile" }
+    sh %{ git ci -m "Bumped to version #{version}" -o "#{app.spec.name}.gemspec" -o "Gmfile" }
   end
   
   def push_to_github

data/gm_networks/rubyforge_network.rb

@@ -24,7 +24,7 @@ class RubyforgeNetwork < GM::Network
     prepare
     version = config[:general][:version]
     GM::Command.run(:build, ['-E'])
-    sh "rubyforge add_release #{group_id} #{package_id} #{version} pkg/#{app.gem_file_name}"
+    sh "rubyforge add_release #{group_id} #{package_id} #{version} pkg/#{gem_file_name}"
   end
   
   def published_versions

data/lib/gm/app.rb

@@ -4,33 +4,23 @@ module GM
   class App
     include Singleton
     
-    attr_accessor :configuration_passes
-    attr_accessor :gemspec
-    attr_accessor :emulate
-    attr_accessor :gem_file_name
-    attr_accessor :log_level
-    
     def initialize # :nodoc:
-      @log_level = :normal
       reset!
     end
     
     # reset the app
     def reset!
-      @configuration_passes = Hash.new { |h, k| h[k] = {} }
+      EC.store.reset!(true)
+      GM::Behavior.behaviors.clear
       GM::Command.commands.clear
       GM::Network.networks.clear
-    end
-    
-    # exclude a pass from the configuration fase
-    def exclude_pass(name, fase=:normal)
-      @configuration_passes[fase.to_sym].delete(name.to_sym)
-    end
-    
-    # extra options provided by the app.
-    def extra_options(options)
-      options.flag 'v', 'verbose', :desc => 'Print more information.'
-      options.flag 'd', 'debug', :desc => 'Print debugging information.'
+      
+      EC.store.specify do |root|
+        root.conf(:log_level) do |c|
+          c.should_be_a String
+          c.should_not_be_empty
+        end
+      end
     end
     
     # run the app
@@ -39,6 +29,16 @@ module GM
       load_commands
       load_networks
       
+      if ARGV.include? '-v'
+        EC.store.config[:log_level] = 'verbose'
+        ARGV.delete '-v'
+      elsif ARGV.include? '-d'
+        EC.store.config[:log_level] = 'debug'
+        ARGV.delete '-d'
+      else
+        EC.store.config[:log_level] = 'normal'
+      end
+      
       load_configuration('~/.gmrc')
       load_configuration('Gmfile')
       EC.store.validate
@@ -55,21 +55,24 @@ module GM
       end
     end
     
-    # should we emulate github?
-    def self.emulate?
-      instance.emulate || false
+    def reset_spec!
+      @spec = nil
+    end
+    
+    def spec
+      @spec ||= Gem::Specification.new
     end
     
     def log(msg)
-      puts msg
+      puts msg if %w( debug verbose normal ).include? EC.store.config[:log_level]
     end
     
     def info(msg)
-      puts msg if log_level == :verbose
+      puts msg if %w( debug verbose ).include? EC.store.config[:log_level]
     end
     
     def debug(msg)
-      puts msg if log_level == :verbose or log_level == :debug
+      puts msg if %w( debug ).include? EC.store.config[:log_level]
     end
     
     private

data/lib/gm/behavior.rb

@@ -14,6 +14,8 @@ module GM
     
     loads :behaviors
     
+    attr_accessor :command
+    
     def run
       
     end

data/lib/gm/command.rb

@@ -19,7 +19,6 @@ module GM
     
     # build a command
     def self.run(cmd_name=nil, argv=ARGV)
-      app = GM.app
       if Array === cmd_name
         argv = cmd_name
         cmd_name = nil
@@ -27,11 +26,8 @@ module GM
       cmd = self.build(cmd_name, argv)
       clip = Clip(argv) do |p|
         p.banner = cmd.banner_text
-        app.extra_options(p)
-        cmd.extra_options(p)
+        cmd.add_options(p)
       end
-      app.log_level = :verbose if clip.verbose?
-      app.log_level = :debug   if clip.debug?
       cmd.options = clip
       argv.clear
       argv.concat(clip.remainder)
@@ -58,7 +54,7 @@ module GM
     end
     
     # A command can overwrite this method in order to add extra command line options.
-    def extra_options(options)
+    def add_options(options)
     end
     
     # A command must overwrite this method.

data/lib/gm/helpers.rb

@@ -12,7 +12,11 @@ module GM
     end
     
     def spec
-      GM.app.gemspec
+      GM.app.spec
+    end
+    
+    def gem_file_name
+      "#{spec.name}-#{spec.version}.gem"
     end
     
   end

data/test/command_test.rb

@@ -69,8 +69,8 @@ class CommandTest < Test::Unit::TestCase
       hello_cmd = mock('hello_command') do
         expects(:run)
         expects(:banner_text).returns("")
-        expects(:extra_options).with() { |value| Clip::Parser === value  }
-        expects(:options=).with()      { |value| Clip::Parser === value  }
+        expects(:add_options).with() { |value| Clip::Parser === value  }
+        expects(:options=).with()    { |value| Clip::Parser === value  }
         expects(:argv=).with %w( p )
       end
       hello_cmd_class = mock('hello_command_class') do
@@ -85,8 +85,8 @@ class CommandTest < Test::Unit::TestCase
       hello_cmd = mock('hello_command') do
         expects(:run)
         expects(:banner_text).returns("")
-        expects(:extra_options).with() { |value| Clip::Parser === value  }
-        expects(:options=).with()      { |value| Clip::Parser === value  }
+        expects(:add_options).with() { |value| Clip::Parser === value  }
+        expects(:options=).with()    { |value| Clip::Parser === value  }
         expects(:argv=).with %w( p )
       end
       hello_cmd_class = mock('hello_command_class') do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gm
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors: 
 - Simon Menke
@@ -20,7 +20,37 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.0.3
+        version: 0.0.4
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: clip
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.0.0
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: rubigen
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.5.1
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: simonmenke-ec
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.0.4
     version: 
 - !ruby/object:Gem::Dependency 
   name: clip
@@ -52,6 +82,14 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- test/command_test.rb
+- test/gem_extentions_test.rb
+- test/system_test.rb
+- test/test_helper.rb
+- bin/gem-make
+- bin/gm
+- LICENSE.txt
+- README.textile
 - gm_generators/bin/bin_generator.rb
 - gm_generators/bin/templates/bin/bin.rb
 - gm_generators/gem/gem_generator.rb
@@ -105,14 +143,6 @@ files:
 - gm_generators/rails/templates/rails
 - gm_generators/test
 - gm_generators/test/templates
-- test/command_test.rb
-- test/gem_extentions_test.rb
-- test/system_test.rb
-- test/test_helper.rb
-- bin/gem-make
-- bin/gm
-- LICENSE.txt
-- README.textile
 - lib/autotest/discover.rb
 - lib/autotest/gm.rb
 - lib/extentions/gem.rb
@@ -157,3 +187,7 @@ test_files:
 - test/gem_extentions_test.rb
 - test/system_test.rb
 - test/test_helper.rb
+- test/command_test.rb
+- test/gem_extentions_test.rb
+- test/system_test.rb
+- test/test_helper.rb