radiant-go 0.1.4 → 0.1.6

data/CHANGELOG

@@ -1,7 +1,12 @@
 == Change Log
 
+=== 0.1.5 (August 24, 2010)
 
-=== 0.1.3 (August 23, 2010)
+* Altered the version grabbing of gems to be more thorough and precise [Mario Visic]
+* Fixed a bug causing the environment to require the same gem multiple times [Mario Visic]
+* Altered the gemfile to use strict versioning [Dirk Kelly]
+
+=== 0.1.4 (August 23, 2010)
 
 * Fixed a bug with running bootstrap multiple times on the same project [Mario Visic]
 

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.6

data/config/Gemfile

@@ -1,12 +1,16 @@
-source 'http://rubygems.org'
+source :gemcutter
 
 gem 'rails',                        '2.3.8'
-gem 'sqlite3-ruby',                 :require => 'sqlite3'
-gem 'haml',                         '>= 3.0.0'
-gem 'compass',                      '>= 0.10.4'
-gem 'compass-960-plugin',           '>= 0.9.13'
-gem 'rmagick',                      '>= 2.13.1'
-gem 'aws-s3',                       '>= 0.6.2', :require => 'aws/s3'
-gem 'paperclip',                    '>= 2.3.3'
-gem 'radiant-forms-extension',      '>= 2.0.1'
-gem 'radiant-settings-extension',   '>= 1.1.1'
+gem 'json_pure',                    '1.4.6'
+gem 'RedCloth',                     '4.2.3'
+gem 'radiant',                      '0.9.1'
+gem 'acts_as_list',                 '0.1.2'
+gem 'sqlite3-ruby',                 '1.3.1',  :require => 'sqlite3'
+gem 'haml',                         '3.0.17'
+gem 'compass',                      '0.10.4'
+gem 'compass-960-plugin',           '0.9.13'
+gem 'rmagick',                      '2.13.1'
+gem 'aws-s3',                       '0.6.2',  :require => 'aws/s3'
+gem 'paperclip',                    '2.3.3'
+gem 'radiant-forms-extension',      '2.0.1'
+gem 'radiant-settings-extension',   '1.1.1'

data/lib/radiant-go/installers/main.rb

@@ -14,7 +14,7 @@ module RadiantGo
         
         # setup default gemfile location
         if File.exists?(@project_name + '/Gemfile')
-          Config.gemfile_location = @project_name + '/Gemfile'
+          Config.gemfile_location = File.expand_path(@project_name) + '/Gemfile'
         else
           Config.gemfile_location = File.expand_path(File.dirname(__FILE__)) + '/../../../config/Gemfile' 
         end

data/lib/radiant-go/installers/radiant.rb

@@ -27,19 +27,33 @@ module RadiantGo
         Dir.chdir(@name) do
         
           # open our config
-          config_file   = File.open('config/environment.rb', 'r')
-          config_string = ''
+          config_file         = File.open 'config/environment.rb'
+          current_gems        = []
+          
+          # get a list of the gems in the config
+          while (line = config_file.gets)
+            if gem = line.match(/config.gem\s*['"](.*?)['"]/)
+              current_gems <<  gem[1]
+            end
+          end
+          
+          # go back to the beginning of our environment file and blank out our strings
+          config_file.rewind
           line          = ''
+          config_string = ''
           
           # read up to the part where we are loading gems
           while(line.index('config.gem') == nil)
             line          = config_file.gets
             config_string += line
           end
-            
+                
           # loop through all our radiant extensions and add the lines we need for config
           all_extensions.each do |gem|
-            config_string += "  config.gem '#{gem[:name]}', :version => '#{gem[:requirement]}', :lib => false\n"
+            # we only add the gem to our config if it's not already there!
+            if !current_gems.any? {|current_gem| current_gem == gem[:name]}
+              config_string += "  config.gem '#{gem[:name]}', :version => '#{gem[:requirement]}', :lib => false\n"
+            end
           end
           
           # read the rest of the config 
@@ -86,7 +100,7 @@ module RadiantGo
           gemfile     = File.open(Config.gemfile_location, 'r')
 
           while(line = gemfile.gets)
-            if extension = line.match(/gem.*(radiant-.*-extension).*['"](.*)['"]/)
+            if extension = line.match(/gem.*(radiant-.*-extension).*['"]\s*((=|>=|>|<|<=|~>)?\s*[\d.rc]*)\s*['"]/)
               extensions.push(:name => extension[1], :requirement => extension[2])
             end
             

data/radiant-go.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{radiant-go}
-  s.version = "0.1.4"
+  s.version = "0.1.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["squaretalent"]
-  s.date = %q{2010-08-23}
+  s.date = %q{2010-08-24}
   s.default_executable = %q{radiant-go}
   s.description = %q{a quick an easy way to create radiant projects that are ready to use straight away, automatically perform bootstraps, migrations and updates for radiant and extensions, radiant-go is completely customizable little orphan awesome}
   s.email = %q{mario@mariovisic.com}

data/spec/radiant-go/installers/radiant_spec.rb

@@ -90,6 +90,26 @@ module RadiantGo
         File.size('test/db/development.' + Config.database + '.db').should be > size
         
       end
+      
+      it 'should not create mutiple config.gem lines in the environment file when run more than once' do
+        
+        @installer.update_config
+        @installer.update_config
+        
+        required_gems = []
+        environment   = File.open 'test/config/environment.rb' 
+        
+        # get a list of the gems in the config
+        while (line = environment.gets)
+          if gem = line.match(/config.gem\s*['"](.*?)['"]/)
+            required_gems <<  gem[1]
+          end
+        end
+        
+        # and check for duplicates
+        required_gems.eql?(required_gems.uniq).should be true
+      
+      end
 
     end
     

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-go
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - squaretalent
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-23 00:00:00 +08:00
+date: 2010-08-24 00:00:00 +08:00
 default_executable: radiant-go
 dependencies: 
 - !ruby/object:Gem::Dependency