webistrano_cli 0.0.1 → 0.0.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    webistrano_cli (0.0.1)
+    webistrano_cli (0.0.2)
       activeresource (< 3.1.0)
       highline
       mechanize

data/bin/webistrano_cli

@@ -9,7 +9,9 @@ require 'slop'
 require 'webistrano_cli'
 
 # parse assumes ARGV, otherwise you can pass it your own Array
-opts = Slop.parse :help => true do
+opts = Slop.new :help => true do
+  banner 'Usage: webistrano_cli -p project_name'
+  description 'command allow to deploy projects from webistrano'
   on :p, :project, 'Project name', true
   on :s, :stage, 'Stage', true
   on :t, :task, 'Task', true
@@ -17,5 +19,9 @@ opts = Slop.parse :help => true do
     puts 'Version 0.0.1'
   end
 end
-
-opts.p? ? WebistranoCli.deploy(opts.to_hash) : puts(opts.help)
+begin
+  opts.parse
+  opts.p? ? WebistranoCli.deploy(opts.to_hash) : (puts(opts.help) unless opts.v?)
+rescue Slop::Error => ex
+  puts ex.message
+end

data/lib/webistrano_cli.rb

@@ -1,29 +1,20 @@
 # -*- encoding: utf-8 -*-
 require 'highline/import'
 require 'webistrano_cli/version'
+require 'webistrano_cli/config'
 require 'webistrano_cli/task'
 
 module WebistranoCli
   class << self
     def deploy opts = {}
-      project = opts[:project]
-      stage   = opts[:stage]  || 'staging'
-      task    = opts[:task]   || 'deploy:migrations'
-
-      config = {}
-
-      [:site, :user,:password].each do |field|
-        config[field] = ENV["WCLI_#{field.upcase}"]
-        next if config[field]
-        config[field] = ask("webistrano #{field}: ") do |q|
-          q.whitespace = :strip_and_collapse
-          q.validate  = lambda { |p| p.length > 0 }
-          q.responses[:not_valid] = "can't be blank!"
-        end
-      end
-
-      [Project, Stage, Deployment].each { |model| model.configure(config) }
-      Task.new(project, stage, task).run
+      config = Config.new
+      config_hash = Config.new.get
+      [Project, Stage, Deployment].each { |model| model.configure(config_hash) }
+      Task.new(
+        opts[:project],
+        config.stage(opts[:stage]),
+        config.task(opts[:task])
+      ).run
     end
   end
 end

data/lib/webistrano_cli/config.rb

@@ -0,0 +1,54 @@
+# -*- encoding: utf-8 -*-
+require 'yaml'
+module WebistranoCli
+  class Config
+
+    def initialize
+      @file_path = File.expand_path('~/.webistrano_cli.yml')
+      if File.exists?(@file_path)
+        @config = YAML.load_file(@file_path) rescue nil
+      else
+        @config = nil
+      end
+    end
+
+    def get
+      config = {}
+
+      [:site, :user,:password].each do |field|
+        config[field] = ENV["WCLI_#{field.to_s.upcase}"] || (@config['webistrano_cli'][field.to_s] rescue nil)
+        next if config[field]
+        config[field] = ask("webistrano #{field}: ") do |q|
+          q.whitespace = :strip_and_collapse
+          q.validate  = lambda { |p| p.length > 0 }
+          q.responses[:not_valid] = "can't be blank!"
+        end
+      end
+
+      File.open(@file_path, 'w') do |f|
+        obj = {
+          'webistrano_cli' => {
+            'site' => config[:site],
+            'user' => config[:user],
+            'password' => config[:password],
+            'defaults' => {
+              'stage' => 'staging',
+              'task'  => 'deploy:migrations'
+            }
+          }
+        }
+        YAML.dump obj, f
+      end unless File.exists?(@file_path)
+      config
+    end
+
+    def stage opt
+      opt || (@config['webistrano_cli']['defaults']['stage'] rescue nil) || 'staging'
+    end
+
+    def task opt
+      opt || (@config['webistrano_cli']['defaults']['task'] rescue nil) || 'deploy:migrations'
+    end
+
+  end
+end

data/lib/webistrano_cli/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding: utf-8 -*-
 module WebistranoCli
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: webistrano_cli
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-01 00:00:00.000000000 +02:00
+date: 2011-08-03 00:00:00.000000000 +02:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2154635660 !ruby/object:Gem::Requirement
+  requirement: &2157636100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154635660
+  version_requirements: *2157636100
 - !ruby/object:Gem::Dependency
   name: slop
-  requirement: &2154634820 !ruby/object:Gem::Requirement
+  requirement: &2157635080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154634820
+  version_requirements: *2157635080
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &2154632940 !ruby/object:Gem::Requirement
+  requirement: &2157634160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154632940
+  version_requirements: *2157634160
 - !ruby/object:Gem::Dependency
   name: mechanize
-  requirement: &2154632520 !ruby/object:Gem::Requirement
+  requirement: &2157633560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154632520
+  version_requirements: *2157633560
 - !ruby/object:Gem::Dependency
   name: activeresource
-  requirement: &2154632020 !ruby/object:Gem::Requirement
+  requirement: &2157633020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - <
@@ -66,7 +66,7 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2154632020
+  version_requirements: *2157633020
 description: Allow to deploy projects from webistrano via console
 email:
 - dariusz.gertych@gmail.com
@@ -83,6 +83,7 @@ files:
 - Rakefile
 - bin/webistrano_cli
 - lib/webistrano_cli.rb
+- lib/webistrano_cli/config.rb
 - lib/webistrano_cli/deployment.rb
 - lib/webistrano_cli/project.rb
 - lib/webistrano_cli/stage.rb
@@ -104,7 +105,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -342391452499143948
+      hash: -1627625348420381559
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -113,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -342391452499143948
+      hash: -1627625348420381559
 requirements: []
 rubyforge_project: webistrano_cli
 rubygems_version: 1.6.2