winnie 0.0.1 → 0.0.2

data/.gitignore

@@ -1,21 +1,3 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC
+pkg/*
+*.gem
+.bundle

data/Gemfile

@@ -0,0 +1,3 @@
+source :rubygems
+
+gemspec

data/Gemfile.lock

@@ -0,0 +1,26 @@
+PATH
+  remote: .
+  specs:
+    winnie (0.0.1)
+      json
+      rest-client
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    fakefs (0.2.1)
+    json (1.4.6)
+    mime-types (1.16)
+    rest-client (1.6.1)
+      mime-types (>= 1.16)
+    rspec (1.3.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  fakefs
+  json
+  rest-client
+  rspec (>= 1.2.9)
+  winnie!

data/Rakefile

@@ -1,24 +1,5 @@
-require 'rubygems'
-require 'rake'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "winnie"
-    gem.summary = %Q{Winnie command line tool}
-    gem.description = %Q{Command line tool which allows interacting with winnie's API}
-    gem.email = "winnie-devs@ragnarson.com"
-    gem.homepage = "http://winniecloud.net"
-    gem.authors = ["winnie"]
-    gem.add_dependency "json"
-    gem.add_dependency "rest-client"
-    gem.add_development_dependency "rspec", ">= 1.2.9"
-    gem.add_development_dependency "fakefs"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
+require 'bundler'
+Bundler::GemHelper.install_tasks
 
 require 'spec/rake/spectask'
 Spec::Rake::SpecTask.new(:spec) do |spec|
@@ -26,22 +7,4 @@ Spec::Rake::SpecTask.new(:spec) do |spec|
   spec.spec_files = FileList['spec/**/*_spec.rb']
 end
 
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-end
-
-task :spec => :check_dependencies
-
 task :default => :spec
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "winnie #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/lib/winnie/client.rb

@@ -3,23 +3,23 @@ module Winnie
     def initialize(api_key)
       @api_key = api_key
     end
-    
+
     def host
       ENV['WINNIE_HOST'] || 'admin.winniecloud.net'
     end
-    
+
     def winnie_url
       "http://#{host}"
     end
-    
+
     def account
       get('/account')
     end
-    
+
     def apps
       get('/apps')
     end
-    
+
     def command(command, code_name)
       post("/apps/#{code_name}/command", :body => command)
     end
@@ -27,7 +27,7 @@ module Winnie
     def post(path, params = {})
       request(path, :post, params)
     end
-    
+
     def get(path)
       request(path, :get)
     end
@@ -35,7 +35,7 @@ module Winnie
     def request(path, method, params = {})
       headers = {:accept => 'application/json'}.merge(Client.winnie_headers)
       params.merge!(:api_key => @api_key)
-      
+
       RestClient::Request.execute(
         :method   => method,
         :url      => "#{winnie_url}#{path}",
@@ -43,23 +43,22 @@ module Winnie
         :payload  => params
       ) { |response, request| process_response(response) }
     end
-    
+
     class UnauthorizedException < Exception; end
     class ResourceNotFoundException < Exception; end
     class CommandFailedException < Exception; end
-      
+
     def self.version
-      version_file = File.join(File.dirname(__FILE__), '..', '..', 'VERSION')
-      @@version ||= File.read(version_file).strip
+      VERSION
     end
-    
+
     private
-    
+
     def self.winnie_headers
       {'User-Agent'     => "winnie-gem-#{version}",
        'X-Ruby-Version' => RUBY_VERSION}
     end
-    
+
     def process_response(response)
       # TODO: this fragment could look better
       if [404, 500, 401].include?(response.code)
@@ -69,15 +68,15 @@ module Winnie
           when 500; CommandFailedException
           when 401; raise UnauthorizedException.new
         end
-        
-        error = JSON.parse(response.body)['error']        
+
+        error = JSON.parse(response.body)['error']
         raise exception.new(error)
       end
-      
+
       response.return!
 
       if response.code == 302 and response.args[:url] =~ /user_session/
-        raise UnauthorizedException.new 
+        raise UnauthorizedException.new
       end
 
       JSON.parse(response.body)

data/lib/winnie/commands/auth.rb

@@ -9,25 +9,26 @@ module Winnie
         super(args)
         load_api_key if api_key_exists?
       end
-      
+
       def run
         confirm('Do you want to change your API key?') if api_key_exists?
         ask_for_api_key
         save_api_key
         validate_api_key
       end
-      
+
       def ask_for_api_key
         display "Type your Winnie API key"
         display "Key: ", false
         self.api_key = ask
       end
-      
+
       def save_api_key
         FileUtils.mkdir_p(config_path)
         File.open(api_key_path, 'w') { |file| file << api_key }
+        set_credentials_permissions
       end
-      
+
       def load_api_key
         self.api_key = File.read(api_key_path)
       end
@@ -36,14 +37,19 @@ module Winnie
         winnie.account  # If it's not correct, Winnie::Client::UnauthorizedException will be raised
         display 'Your winnie API key is OK!'
       end
-            
+
       def api_key_exists?
         File.exists?(api_key_path)
       end
-      
+
       def api_key_path
         File.join(config_path, 'api_key')
       end
+
+      def set_credentials_permissions
+        FileUtils.chmod(0700, config_path)
+        FileUtils.chmod(0600, api_key_path)
+      end
     end
   end
 end

data/lib/winnie/version.rb

@@ -0,0 +1,3 @@
+module Winnie
+  VERSION = "0.0.2"
+end

data/spec/commands/auth_spec.rb

@@ -2,53 +2,53 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe Winnie::Commands::Auth do
   include FakeFS::SpecHelpers
-  
+
   before do
     @auth = Winnie::Commands::Auth.new
     @auth.stub(:display)
   end
-  
+
   describe "initialize" do
     describe "when API key doesn't exist" do
       it "should not load API key" do
         @auth.api_key.should be_nil
       end
     end
-    
+
     describe "when API key exists" do
       before { create_api_key_file('NobodyKnowsIt') }
-      
+
       it "should load API key" do
         auth = Winnie::Commands::Auth.new
         auth.api_key.should == 'NobodyKnowsIt'
       end
     end
   end
-  
+
   describe "run" do
     before do
       @auth.stub(:ask_for_api_key)
       @auth.stub(:save_api_key)
       @auth.stub(:validate_api_key)
     end
-    
+
     describe "when API key doesn't exist" do
       it "should ask for API key" do
         @auth.should_receive(:ask_for_api_key)
         @auth.run
       end
-      
+
       it "should save API key" do
         @auth.should_receive(:save_api_key)
         @auth.run
       end
-      
+
       it "should validate API key" do
         @auth.should_receive(:validate_api_key)
-        @auth.run        
+        @auth.run
       end
     end
-    
+
     describe "when API key exists" do
       it "should ask if overwrite API key" do
         @auth.should_receive(:confirm).with('Do you want to change your API key?')
@@ -57,22 +57,31 @@ describe Winnie::Commands::Auth do
       end
     end
   end
-  
+
   describe "save_api_key" do
-    before { @auth.api_key = 'secret_api_key' }
-    
+    before do
+      @auth.api_key = 'secret_api_key'
+      @auth.stub(:set_credentials_permissions => true)
+    end
+
     it "should create config directory" do
       FileUtils.should_receive(:mkdir_p).with(@auth.config_path)
       @auth.save_api_key
     end
-    
+
     it "should save API key to file" do
       @auth.save_api_key
       key = File.read(@auth.api_key_path)
       key.should == 'secret_api_key'
-    end    
+    end
+
+    it "should protect secret api key file from reading by others" do
+      # fakefs cannot check mode of files - File.stat(some_file)
+      @auth.should_receive(:set_credentials_permissions)
+      @auth.save_api_key
+    end
   end
-  
+
   describe "load_api_key" do
     before { create_api_key_file('VerySecretOne') }
 
@@ -81,7 +90,7 @@ describe Winnie::Commands::Auth do
       @auth.api_key.should == 'VerySecretOne'
     end
   end
-  
+
   it "should return api_key_path" do
     @auth.api_key_path.should == File.join(@auth.config_path, 'api_key')
   end

data/winnie.gemspec

@@ -1,84 +1,39 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "winnie/version"
 
 Gem::Specification.new do |s|
-  s.name = %q{winnie}
-  s.version = "0.0.1"
+  s.name        = "winnie"
+  s.version     = Winnie::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["winnie"]
+  s.email       = ["winnie-devs@ragnarson.com"]
+  s.homepage    = "http://rubygems.org/gems/dupa"
+  s.summary     = %Q{Winnie command line tool}
+  s.description = %Q{Command line tool which allows interacting with winnie's API}
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["winnie"]
-  s.date = %q{2010-08-27}
-  s.default_executable = %q{winnie}
-  s.description = %q{Command line tool which allows interacting with winnie's API}
-  s.email = %q{winnie-devs@ragnarson.com}
-  s.executables = ["winnie"]
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "bin/winnie",
-     "lib/winnie/client.rb",
-     "lib/winnie/command.rb",
-     "lib/winnie/commands/app.rb",
-     "lib/winnie/commands/auth.rb",
-     "lib/winnie/commands/base.rb",
-     "lib/winnie/commands/help.rb",
-     "lib/winnie/helpers.rb",
-     "lib/winnie/winnie.rb",
-     "spec/client_spec.rb",
-     "spec/command_spec.rb",
-     "spec/commands/app_spec.rb",
-     "spec/commands/auth_spec.rb",
-     "spec/commands/base_spec.rb",
-     "spec/spec.opts",
-     "spec/spec_helper.rb",
-     "spec/winnie_spec.rb",
-     "winnie.gemspec"
-  ]
-  s.homepage = %q{http://winniecloud.net}
-  s.rdoc_options = ["--charset=UTF-8"]
+  s.rubyforge_project = "dupa"
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Winnie command line tool}
-  s.test_files = [
-    "spec/client_spec.rb",
-     "spec/command_spec.rb",
-     "spec/commands/app_spec.rb",
-     "spec/commands/auth_spec.rb",
-     "spec/commands/base_spec.rb",
-     "spec/spec_helper.rb",
-     "spec/winnie_spec.rb"
-  ]
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  s.add_dependency "json"
+  s.add_dependency "rest-client"
+  s.add_development_dependency "rspec", ">= 1.2.9"
+  s.add_development_dependency "fakefs"
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<json>, [">= 0"])
-      s.add_runtime_dependency(%q<rest-client>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
-      s.add_development_dependency(%q<fakefs>, [">= 0"])
-    else
-      s.add_dependency(%q<json>, [">= 0"])
-      s.add_dependency(%q<rest-client>, [">= 0"])
-      s.add_dependency(%q<rspec>, [">= 1.2.9"])
-      s.add_dependency(%q<fakefs>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<json>, [">= 0"])
-    s.add_dependency(%q<rest-client>, [">= 0"])
-    s.add_dependency(%q<rspec>, [">= 1.2.9"])
-    s.add_dependency(%q<fakefs>, [">= 0"])
-  end
-end
+  # TODO: remove after few releases
+  s.post_install_message = %q{
+========================================================================
 
+If upgrading from 0.0.1 version of winnie do the following:
+> winnie auth
+Enter your API key
+confirm changes
+
+This is important to protect your Winnie Cloud credentials.
+========================================================================
+}
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: winnie
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - winnie
@@ -15,8 +15,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-27 00:00:00 +02:00
-default_executable: winnie
+date: 2010-10-18 00:00:00 +02:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
@@ -77,21 +77,21 @@ dependencies:
   type: :development
   version_requirements: *id004
 description: Command line tool which allows interacting with winnie's API
-email: winnie-devs@ragnarson.com
+email: 
+- winnie-devs@ragnarson.com
 executables: 
 - winnie
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE
-- README.rdoc
+extra_rdoc_files: []
+
 files: 
-- .document
 - .gitignore
+- Gemfile
+- Gemfile.lock
 - LICENSE
 - README.rdoc
 - Rakefile
-- VERSION
 - bin/winnie
 - lib/winnie/client.rb
 - lib/winnie/command.rb
@@ -100,6 +100,7 @@ files:
 - lib/winnie/commands/base.rb
 - lib/winnie/commands/help.rb
 - lib/winnie/helpers.rb
+- lib/winnie/version.rb
 - lib/winnie/winnie.rb
 - spec/client_spec.rb
 - spec/command_spec.rb
@@ -111,12 +112,23 @@ files:
 - spec/winnie_spec.rb
 - winnie.gemspec
 has_rdoc: true
-homepage: http://winniecloud.net
+homepage: http://rubygems.org/gems/dupa
 licenses: []
 
-post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+post_install_message: |
+  
+  ========================================================================
+  
+  If upgrading from 0.0.1 version of winnie do the following:
+  > winnie auth
+  Enter your API key
+  confirm changes
+  
+  This is important to protect your Winnie Cloud credentials.
+  ========================================================================
+
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -139,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: []
 
-rubyforge_project: 
+rubyforge_project: dupa
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
@@ -150,5 +162,6 @@ test_files:
 - spec/commands/app_spec.rb
 - spec/commands/auth_spec.rb
 - spec/commands/base_spec.rb
+- spec/spec.opts
 - spec/spec_helper.rb
 - spec/winnie_spec.rb

data/.document

@@ -1,5 +0,0 @@
-README.rdoc
-lib/**/*.rb
-bin/*
-features/**/*.feature
-LICENSE

data/VERSION

@@ -1 +0,0 @@
-0.0.1