drcapulet-russell 0.1.0 → 0.1.1

data/CHANGELOG.rdoc

@@ -1,3 +1,13 @@
+== 0.1.1
+
+* Refactored the -v flag command: Now reads from VERSION.yml which is automatically updated every release
+* Added jQuery to the frameworks
+* Now config installer checks the version against the current one to update for new release changes
+
+== 0.1.0 / 09 March 2009
+
+* Gem Build
+
 == 0.0.1 / 08 March 2009
 
 * Setting up the entire thing

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
-:patch: 0
 :minor: 1
+:patch: 1

data/lib/russell/commands/install_config.rb

@@ -1,3 +1,4 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'version'))
 require "yaml"
 
 module Russell
@@ -11,8 +12,9 @@ module Russell
       def perform
         begin
           @config = YAML::load(File.open("#{Russell.base_directory}/russell.config"))
+          check_config_version(@config)
           read_and_install_with_config(@config)
-        rescue
+        rescue => error
           q = ask("No config file exists. Create one?", "Not creating one. Exiting")
           if (q == 1)
             create_config
@@ -34,6 +36,22 @@ module Russell
         end
       end
       
+      def check_config_version(config)
+        @version = Russell::Version.read_version
+        if config['version'] != @version[:q]
+          q = ask("Config file is outdated. Would you like to create a new one?", "")
+          if (q == 1)
+            create_config
+            exit
+          else
+            exit
+          end
+        else
+          return true
+        end
+        
+      end
+      
       def create_config
         config = {}
         @frameworks = YAML::load(File.open("#{Russell.base_directory}/frameworks/manifest.yml"))
@@ -45,6 +63,10 @@ module Russell
             config["#{fwname}"] = false
           end
         end
+        
+        @version = Russell::Version.read_version
+        config["version"] = @version[:q]
+        
         write_config(config)
       end
       
@@ -63,7 +85,7 @@ module Russell
       def read_and_install_with_config(config)
         command = :install_one
         config.each do |fw, value|
-          if value
+          if value && (fw != "version")
             self.options[:noask] = true
             self.options[:framework] = fw
             do_command(command, options)

data/lib/russell/commands/install_one.rb

@@ -29,6 +29,8 @@ module Russell
           q = ask(@css["prefix"], framework.capitalize.chomp, @css["type"], @css["response"])
         else
           q = 1
+          puts "Installing the #{framework} framework"
+          puts "======================================"
         end
         
         if (q == 1)
@@ -64,13 +66,12 @@ module Russell
       def show_src_code(config)
         if config['src']
           puts ""
-          puts "----------------------------"
           puts "To include in your project, add the following to the head section of your file:"
-          puts ""
           config['src'].each do |line|
             puts "   #{line}"
           end
           puts ""
+          puts ""
         end
       end
       

data/lib/russell/commands/print_version.rb

@@ -1,3 +1,5 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'version'))
+
 module Russell
   module Commands
     class PrintVersion
@@ -11,8 +13,10 @@ module Russell
           # The quiet option may make scripting easier
         #  puts ::Russell.version[:string]
         # else
+          @version = Russell::Version.read_version
+                    
           lines = []
-          lines << "Russell #{::Russell.version[:string]}"
+          lines << "Russell #{@version[:string]}"
           lines << "Copyright (c) 2009 Alex Coomans"
           lines << "Released under the MIT License."
           puts lines.join("\n")

data/lib/russell/exec.rb

@@ -79,6 +79,7 @@ END
         end
         
         opts.on_tail("-v", "--version", "Print version") do
+          
           self.options[:command] = :print_version
         end
       end

data/lib/russell/version.rb

@@ -1,4 +1,3 @@
-
 module Russell
   module Version
     # Returns a hash representing the version.
@@ -9,51 +8,30 @@ module Russell
     #
     # This method swiped from Haml and then modified, some credit goes to Nathan Weizenbaum
     # I (alex) then swiped it from Compass - so thanks there!
-    attr_writer :version
-    def version
-      return @version if defined?(@version)
-
-      read_version_file
-      parse_version
-
-      if r = revision
+    attr_reader :major, :minor, :patch
+    
+    def scope(file) # :nodoc:
+      File.join(File.dirname(__FILE__), '..', '..', file)
+    end
+        
+    def read_version
+      yaml = YAML::load(File.open("#{Russell.base_directory}/VERSION.yml"))
+      @major = (yaml['major'] || yaml[:major]).to_i
+      @minor = (yaml['minor'] || yaml[:minor]).to_i
+      @patch = (yaml['patch'] || yaml[:patch]).to_i
+            
+      @version = {:string => "#{@major}.#{@minor}.#{@patch}"}
+      @version[:q] = "#{@major}.#{@minor}.#{@patch}"
+      
+      if r = revision_from_git
         @version[:rev] = r
         @version[:string] << " [#{r[0...7]}]"
       end
-
       @version
     end
-
+    
     protected
-
-    def scope(file) # :nodoc:
-      File.join(File.dirname(__FILE__), '..', '..', file)
-    end
-
-    def read_version_file
-      @version = {
-        :string => File.read(scope('VERSION')).strip
-      }
-    end
-
-    def parse_version
-      dotted_string, @version[:label] = @version[:string].split(/-/, 2)
-      numbers = dotted_string.split('.').map { |n| n.to_i }
-      [:major, :minor, :teeny].zip(numbers).each do |attr, value|
-        @version[attr] = value
-      end
-    end
-
-    def revision
-      revision_from_git || revision_from_file
-    end
-
-    def revision_from_file
-      if File.exists?(scope('REVISION'))
-        rev = File.read(scope('REVISION')).strip
-        rev = nil if rev !~ /[a-f0-9]+/
-      end
-    end
+    
 
     def revision_from_git
       if File.exists?(scope('.git/HEAD'))
@@ -64,5 +42,7 @@ module Russell
       end
     end
 
+    module_function :read_version, :revision_from_git, :scope
+    
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: drcapulet-russell
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Alex Coomans
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-08 00:00:00 -08:00
+date: 2009-03-12 00:00:00 -07:00
 default_executable: russell
 dependencies: []