railsthemes 1.0.0 → 1.0.1

data/README.md

@@ -20,6 +20,20 @@ This has been tested with Ruby 1.8.7, and should work with higher versions. 1.8.
 
 Not sure if this will work for Windows users due to invoking tar on the command-line instead of using native Ruby. This is something that we can change going forward, just a matter of time.
 
+## Developer notes
+
+To cut a release, the process I've been using is:
+
+    installer> gem build railsthemes.gemspec
+      Successfully built RubyGem
+      Name: railsthemes
+      Version: 1.0.0
+      File: railsthemes-1.0.0.gem
+
+    installer> gem push railsthemes-1.0.0.gem
+    Pushing gem to https://rubygems.org...
+    Successfully registered gem: railsthemes (1.0.0)
+
 ## Contributing
 
 1. Fork it

data/lib/railsthemes/installer.rb

@@ -11,7 +11,10 @@ module Railsthemes
   class Installer
     def initialize logger = nil
       @logger = logger
-      @server = File.exist?('railsthemes_server') ? File.read('railsthemes_server') : 'https://railsthemes.com'
+      @server = 'https://railsthemes.com'
+      if File.exist?('railsthemes_server')
+        @server = File.read('railsthemes_server').gsub("\n", '')
+      end
       @logger ||= Logger.new(STDOUT)
       # just print out basic information, not all of the extra logger stuff
       @logger.formatter = proc do |severity, datetime, progname, msg|
@@ -91,13 +94,28 @@ module Railsthemes
     def get_download_url server_request_url
       response = nil
       begin
-        response = Net::HTTP.get_response URI.parse(server_request_url)
+        url = URI.parse(server_request_url)
+        http = Net::HTTP.new url.host, url.port
+        http = Net::HTTP.new url.host, url.port
+        if server_request_url =~ /^https/
+          http.use_ssl = true
+          http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+        end
+        path = server_request_url.gsub(%r{https?://[^/]+}, '')
+        response = http.request_get(path)
       rescue Exception => e
         #@logger.info e.message
         #@logger.info e.backtrace
       end
 
-      response.body if response && response.code.to_s == '200'
+      if response
+        if response.code.to_s == '200'
+          return response.body
+        else
+          @logger.info "Got a #{response.code} error while trying to download."
+          return nil
+        end
+      end
     end
 
     def gems_used
@@ -144,7 +162,7 @@ module Railsthemes
     end
 
     def untar_string filepath, newdirpath
-      "tar -zxf #{filepath}"
+      "tar -zxf #{filepath} -C #{newdirpath}"
     end
 
 

data/lib/railsthemes/version.rb

@@ -1,5 +1,5 @@
 module Railsthemes
   unless defined?(Railsthemes::VERSION)
-    VERSION = "1.0.0"
+    VERSION = "1.0.1"
   end
 end

data/spec/lib/railsthemes/installer_spec.rb

@@ -75,7 +75,7 @@ describe Railsthemes::Installer do
   describe :untar_string do
     it 'should return correct value for *.tar.gz file' do
       result = @installer.untar_string 'file.tar.gz', 'newdirpath'
-      result.should == 'tar -zxf file.tar.gz'
+      result.should == 'tar -zxf file.tar.gz -C newdirpath'
     end
   end
 
@@ -183,22 +183,22 @@ describe Railsthemes::Installer do
   end
 
   describe '#get_primary_configuration' do
-    it 'should give haml+scss when haml and sass are in the Gemfile' do
+    it 'should give haml,scss when haml and sass are in the Gemfile' do
       gemfile = using_gems 'haml', 'sass'
       @installer.get_primary_configuration(gemfile).should == 'haml,scss'
     end
 
-    it 'should give haml+css when sass is not in the Gemfile' do
+    it 'should give haml,css when sass is not in the Gemfile but haml is' do
       gemfile = using_gems 'haml'
       @installer.get_primary_configuration(gemfile).should == 'haml,css'
     end
 
-    it 'should give erb, scss when haml is not in the gemfile' do
+    it 'should give erb,scss when haml is not in the gemfile but sass is' do
       gemfile = using_gems 'sass'
       @installer.get_primary_configuration(gemfile).should == 'erb,scss'
     end
 
-    it 'should give erb, scss when haml is not in the gemfile' do
+    it 'should give erb,css when haml and sass are not in the gemfile' do
       gemfile = using_gems
       @installer.get_primary_configuration(gemfile).should == 'erb,css'
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: railsthemes
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Railsthemes
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-20 00:00:00 Z
+date: 2012-04-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thor