veslo 0.0.3 → 0.0.4

data/README.md

@@ -0,0 +1,35 @@
+# veslo
+
+_veslo (ru)_ -- paddle
+
+veslo is a command-line interface for the [Noah](https://github.com/lusis/Noah) server.
+
+The first version implement getting and saving configuration entities:
+
+    veslo configurations get config.yml
+
+The default output is to STDOUT, so you can pipe it wherever you want, for example:
+
+    veslo configurations get config.yml > current_production_config.yml
+
+The put command accepts two arguments: the config name on the server and the local config file to upload (or STDIN) _TODO_
+
+    veslo configurations put config.yml my_new_config.yml
+
+The server to use is either configured via the **~/.noah/veslo.rb** file, or passed in the **-s** paramater.
+
+# Contributing to veslo
+ 
+* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
+* Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it
+* Fork the project
+* Start a feature/bugfix branch
+* Commit and push until you are happy with your contribution
+* Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
+* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
+
+# Copyright
+
+Copyright (c) 2011 Dimitri Krassovski / Wix.com. See LICENSE.txt for
+further details.
+

data/TODO

@@ -0,0 +1,2 @@
+implement put from file
+implement edit

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/lib/veslo.rb

@@ -1,11 +1,12 @@
 require 'rubygems'
 require 'mixlib/cli'
 require 'rest_client'
+require 'json'
 
 class Veslo
   include Mixlib::CLI
-  Veslo::SUPPORTED_METHODS = ["put", "get"]
-  Veslo::SUPPORTED_RESOURCES = ["configurations"]
+  SUPPORTED_METHODS = ["put", "get"]
+  SUPPORTED_RESOURCES = ["configurations"]
 
   option :server_url,
     :short => "-s SERVER",
@@ -16,14 +17,15 @@ class Veslo
     argv = parse_options(arguments)
     @server = RestClient::Resource.new(config[:server_url], :headers => {:accept => "application/octet"})
     parse_commands(argv)
-    execute
+    send(:"resource_#{@method}")
   end
 
   def parse_commands(commands)
-    raise ArgumentError.new("Not the right ammount of arguments") if commands.size != 3
+    raise ArgumentError.new("Not the right ammount of arguments") unless (3..4).include?(commands.size)
     @resource = commands.shift
     @method = commands.shift
     @name = commands.shift
+    @file = commands.shift
     validate_input
   end
 
@@ -32,20 +34,30 @@ class Veslo
     raise NotImplementedError.new("resource #{@resource} not supported") unless SUPPORTED_RESOURCES.include?(@resource)
   end
 
-  def execute
-    begin
-      result = @server["#{@resource}/#{@name}"].get
-      $stdout.puts result.to_str
-      return 0
-    rescue RestClient::ExceptionWithResponse => e
-      case e.response.code
-      when 404
-        $stderr.puts("Requested resource not found")
-        return 1
-      else
-        $stderr.puts("Request failed with status: #{e.response.code}")
-        return 2
-      end
+  def resource_get
+    result = @server["#{@resource}/#{@name}"].get
+    $stdout.puts result.to_str
+    return 0
+  rescue RestClient::ExceptionWithResponse => e
+    case e.response.code
+    when 404
+      $stderr.puts("Requested resource not found")
+      return 1
+    else
+      $stderr.puts("Request failed with status: #{e.response.code}")
+      return 2
     end
   end
-end
+
+  def resource_put
+    raise NotImplementedError, "No STDIN yet" unless @file
+    file_content = File.open(@file, 'r').read
+    put_data = "{\"format\":\"app/octet\", \"body\":#{file_content.to_json}}"
+    result = @server["#{@resource}/#{@name}"].put(put_data)
+    $stdout.puts "Config uploaded"
+    return 0
+  rescue Errno::ENOENT
+    $stderr.puts "File not found: #{@file}"
+    return 3
+  end
+end

data/spec/fixtures/config.yaml

@@ -0,0 +1,3 @@
+foo:
+  bar: baz
+  foobar: foobaz

data/spec/veslo_spec.rb

@@ -23,12 +23,16 @@ describe "Veslo", "parsing arguments" do
     lambda{@veslo.parse_commands(["configurations", "get", "chix"])}.should_not raise_error(ArgumentError)
   end
 
+  it "should accept 4 well-formed arguments" do
+    lambda{@veslo.parse_commands(["configurations", "put", "chix", "chix.yml"])}.should_not raise_error(ArgumentError)
+  end
+
   it "should not accept less than 3 arguments" do
     lambda{@veslo.parse_commands(["foo", "bar"])}.should raise_error(ArgumentError)
   end
 
-  it "should not accept more than 3 arguments" do
-    lambda{@veslo.parse_commands(["foo", "bar", "baz", "foobar"])}.should raise_error(ArgumentError)
+  it "should not accept more than 4 arguments" do
+    lambda{@veslo.parse_commands(["foo", "bar", "baz", "foobar", "foobaz"])}.should raise_error(ArgumentError)
   end
 
   it "should not accept unknown methods" do
@@ -47,7 +51,8 @@ describe "Veslo", "interacting with server" do
     @get_existing_argv = @base_argv + ["get", "existing"]
     @get_missing_argv = @base_argv + ["get", "missing"]
     @get_error_argv = @base_argv + ["get", "error"]
-
+    @put_new_argv = @base_argv + ["put", "creating", "spec/fixtures/config.yaml"]
+    @put_missing_argv = @base_argv + ["put", "config_name", "nofile.yml"]
     FakeWeb.allow_net_connect = false
     FakeWeb.register_uri(:get, "http://example.com/configurations/existing", :body => "Hello World!")
     FakeWeb.register_uri(:get, "http://example.com/configurations/missing", :body => "Nothing to be found 'round here", :status => ["404", "Not Found"])
@@ -76,4 +81,20 @@ describe "Veslo", "interacting with server" do
     end
     @output.should == "Request failed with status: 500\n"
   end
-end
+
+  it "should not upload a missing file" do
+    @output = capture(:stderr) do
+      @veslo.run!(*@put_missing_argv)
+    end
+    @output.should == "File not found: nofile.yml\n"
+  end
+
+  it "should upload a config" do
+    @output = capture(:stdout) do
+      @veslo.run!(*@put_new_argv)
+    end
+    @output.should == "Config uploaded\n"
+    FakeWeb.last_request.method.should == "PUT"
+    FakeWeb.last_request.body.should == "{\"format\":\"app/octet\", \"body\":\"foo:\\n  bar: baz\\n  foobar: foobaz\\n\"}"
+  end
+end

data/veslo.gemspec

@@ -5,17 +5,18 @@
 
 Gem::Specification.new do |s|
   s.name = "veslo"
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dimitri Krassovski"]
-  s.date = "2011-12-05"
+  s.date = "2011-12-06"
   s.description = "Command line utility to manage Noah configurations"
   s.email = "dimitri@wix.com"
   s.executables = ["veslo", "veslo"]
   s.extra_rdoc_files = [
     "LICENSE.txt",
-    "README.rdoc"
+    "README.md",
+    "TODO"
   ]
   s.files = [
     ".document",
@@ -23,11 +24,13 @@ Gem::Specification.new do |s|
     "Gemfile",
     "Gemfile.lock",
     "LICENSE.txt",
-    "README.rdoc",
+    "README.md",
     "Rakefile",
+    "TODO",
     "VERSION",
     "bin/veslo",
     "lib/veslo.rb",
+    "spec/fixtures/config.yaml",
     "spec/spec_helper.rb",
     "spec/veslo_spec.rb",
     "veslo.gemspec"
@@ -35,7 +38,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/Wixpress/veslo"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
+  s.rubygems_version = "1.8.12"
   s.summary = "Command line Noah client"
 
   if s.respond_to? :specification_version then

metadata

@@ -1,195 +1,155 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: veslo
-version: !ruby/object:Gem::Version 
-  hash: 25
+version: !ruby/object:Gem::Version
+  version: 0.0.4
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 3
-  version: 0.0.3
 platform: ruby
-authors: 
+authors:
 - Dimitri Krassovski
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-12-05 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id001
+date: 2011-12-06 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: mixlib-cli
-  prerelease: false
-  type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &70250054294280 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id002
-  name: rest-client
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *70250054294280
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: &70250054293000 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id003
-  name: rdoc
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-  type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70250054293000
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: &70250054292200 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id004
-  name: fakeweb
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
+  version_requirements: *70250054292200
+- !ruby/object:Gem::Dependency
+  name: fakeweb
+  requirement: &70250054291580 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *70250054291580
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70250054290900 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 3
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.3.0
-  version_requirements: *id005
-  name: rspec
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *70250054290900
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &70250054290320 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.0.0
-  version_requirements: *id006
-  name: bundler
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *70250054290320
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: &70250054289720 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 6
-        - 4
+      - !ruby/object:Gem::Version
         version: 1.6.4
-  version_requirements: *id007
-  name: jeweler
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id008
-  name: rcov
   prerelease: false
+  version_requirements: *70250054289720
+- !ruby/object:Gem::Dependency
+  name: rcov
+  requirement: &70250054272700 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
+  prerelease: false
+  version_requirements: *70250054272700
 description: Command line utility to manage Noah configurations
 email: dimitri@wix.com
-executables: 
+executables:
 - veslo
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
-- README.rdoc
-files: 
+- README.md
+- TODO
+files:
 - .document
 - .rspec
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
-- README.rdoc
+- README.md
 - Rakefile
+- TODO
 - VERSION
 - bin/veslo
 - lib/veslo.rb
+- spec/fixtures/config.yaml
 - spec/spec_helper.rb
 - spec/veslo_spec.rb
 - veslo.gemspec
 homepage: http://github.com/Wixpress/veslo
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 477080292991891829
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.12
 signing_key: 
 specification_version: 3
 summary: Command line Noah client
 test_files: []
-

data/README.rdoc

@@ -1,19 +0,0 @@
-= veslo
-
-Description goes here.
-
-== Contributing to veslo
- 
-* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
-* Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it
-* Fork the project
-* Start a feature/bugfix branch
-* Commit and push until you are happy with your contribution
-* Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
-* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
-
-== Copyright
-
-Copyright (c) 2011 Dimitri Krassovski. See LICENSE.txt for
-further details.
-