xploy 0.1.0.beta → 0.1.1.beta

data/CHANGELOG.md

@@ -0,0 +1,23 @@
+# 0.1.1.beta
+
+  * Generate manifest template using `xploy new app.json`
+
+# 0.1.0.beta
+
+  * Project rename from 'xway' to 'xploy'
+
+# 0.0.3.beta
+
+  * Bugfixes
+
+# 0.0.2.beta
+
+  * Bugfixes
+
+# 0.0.1.beta
+
+  * Partially working CLI that integrates with appway
+
+# 0.0.1.alpha
+
+  * Architecture / coding draft

data/README.md

@@ -24,9 +24,20 @@ Or install it yourself as:
 
 ## Usage
 
+Print usage with:
+
     $ xploy
 
-### Recommended config settings
+Generate a new app manifest with:
+
+    $ xploy new example.json
+
+Deploy it to your appway instance on `http://localhost:8000` with:
+
+    $ xploy --servers=http://localhost:8000 --app.name=example --app.manifest=example.json
+    OK
+
+### Recommended Setup
 
 You can store default parameters like `app.name` and `app.manifest` in a file named `.xploy` located in your current working dir.
 
@@ -38,6 +49,28 @@ Here you can just redeploy the preconfigured app like so:
 
     $ xploy redeploy
 
+### Configuration
+
+#### --app.name
+
+The application name
+
+#### --app.manifest
+
+The path to the application manifest
+
+#### --servers
+
+A list of appway servers that the client must communicate with
+
+#### --debug
+
+When set to `true` it will debug all http traffic
+
+#### --version
+
+Print version
+
 ## Development
 
 To run the binary from the repository use the following command with ruby libray path:

data/bin/xploy

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
 
 require 'xploy'
-Xploy::Cli.new.start
+Xploy.build_cli.start

data/lib/xploy.rb

@@ -3,9 +3,14 @@ require 'xploy/error'
 require 'xploy/parameter'
 require 'xploy/api'
 require 'xploy/cli'
+require 'xploy/template'
 
 module Xploy
   def self.parameter
     @parameter ||= Parameter.new.reload!
   end
+
+  def self.build_cli
+    Cli.new Api.new, STDOUT, Template
+  end
 end

data/lib/xploy/api/endpoints.rb

@@ -10,65 +10,44 @@ module Xploy
       end
 
       def find options={}
-        require_options options, :name
-        options[:name] ||= ':name'
-        Request.new 'get', "/applications/#{options[:name]}"
+        Request.new 'get', "/applications/#{extract(options, :name)}"
       end
 
       def update options={}
-        require_options options, :name
-        options[:name] ||= ':name'
-        Request.new 'put', "/applications/#{options[:name]}"
+        Request.new 'put', "/applications/#{extract(options, :name)}"
       end
 
       def delete options={}
-        require_options options, :name
-        options[:name] ||= ':name'
-        Request.new 'delete', "/applications/#{options[:name]}"
+        Request.new 'delete', "/applications/#{extract(options, :name)}"
       end
 
       def log options={}
-        require_options options, :name
-        options[:name] ||= ':name'
-        Request.new 'get', "/applications/#{options[:name]}/log"
+        Request.new 'get', "/applications/#{extract(options, :name)}/log"
       end
 
       def start options={}
-        require_options options, :name
-        options[:name] ||= ':name'
-        Request.new 'post', "/applications/#{options[:name]}/start"
+        Request.new 'post', "/applications/#{extract(options, :name)}/start"
       end
 
       def stop options={}
-        require_options options, :name
-        options[:name] ||= ':name'
-        Request.new 'post', "/applications/#{options[:name]}/stop"
+        Request.new 'post', "/applications/#{extract(options, :name)}/stop"
       end
 
       def restart options={}
-        require_options options, :name
-        options[:name] ||= ':name'
-        Request.new 'post', "/applications/#{options[:name]}/restart"
+        Request.new 'post', "/applications/#{extract(options, :name)}/restart"
       end
 
       def redeploy options={}
-        require_options options, :name
-        options[:name] ||= ':name'
-        Request.new 'post', "/applications/#{options[:name]}/redeploy"
+        Request.new 'post', "/applications/#{extract(options, :name)}/redeploy"
       end
 
     private
 
-      def require_options options, *keys
-        missing_keys = []
-        keys.each do |key|
-          if !options.is_a?(Hash) || options[key] == nil || options[key] == ''
-            missing_keys << key
-          end
-        end
-        unless missing_keys.empty?
-          raise MissingParameter, "Missing app parameter(s): "\
-                                  "#{missing_keys.map(&:to_s).join(', ')}"
+      def extract options, key
+        if !options.is_a?(Hash) || options[key] == nil || options[key] == ''
+          raise MissingParameter, "Missing app parameter '#{key}'"
+        else
+          options[key]
         end
       end
     end

data/lib/xploy/cli.rb

@@ -1,16 +1,25 @@
 module Xploy
   class Cli
-    def initialize api=Api.new, out=STDOUT
+    def initialize api, out, template_class
       @api = api
       @out = out
+      @template_class = template_class
     end
 
     def start
-      commands = Xploy.parameter.rest
-      if Xploy.parameter[:version]
+      parameter = Xploy.parameter
+      commands = parameter.rest
+      if parameter[:version]
         @out.puts "xploy #{VERSION}"
       elsif commands.empty?
-        Xploy.parameter.print_help!
+        parameter.print_help!
+      elsif commands.first == 'new'
+        template_data = @template_class.new.to_s
+        if path = commands[1]
+          File.open(path, 'w') { |f| f.write template_data }
+        else
+          @out.puts template_data
+        end
       else
         @out.puts @api.request(*commands)
       end

data/lib/xploy/template.rb

@@ -0,0 +1,20 @@
+module Xploy
+  class Template
+    def to_s
+      File.read(__FILE__).split("__END__\n").last
+    end
+  end
+end
+
+__END__
+{
+  "name": "example",
+  "repo": {
+    "url": "git://github.com/threez/appway-example.git",
+    "branch": "master"
+  },
+  "packages": {},
+  "install": [
+    "npm install"
+  ]
+}

data/lib/xploy/version.rb

@@ -1,3 +1,3 @@
 module Xploy
-  VERSION = "0.1.0.beta"
+  VERSION = "0.1.1.beta"
 end

data/spec/assets/template.json

@@ -0,0 +1,11 @@
+{
+  "name": "example",
+  "repo": {
+    "url": "git://github.com/threez/appway-example.git",
+    "branch": "master"
+  },
+  "packages": {},
+  "install": [
+    "npm install"
+  ]
+}

data/spec/lib/xploy/api/endpoints_spec.rb

@@ -38,8 +38,6 @@ describe Xploy::Api::Endpoints do
   end
 
   context 'mock require_options' do
-    before { endpoints.stub('require_options') }
-
     describe 'list' do
       subject            { endpoints.list({}) }
       its('method_name') { should eq 'get' }

data/spec/lib/xploy/cli_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 require 'xploy/cli'
+require 'xploy/error'
 require 'xploy/version'
+require 'fakefs/safe'
 
 describe Xploy::Cli do
   let('parameter') do
@@ -9,11 +11,19 @@ describe Xploy::Cli do
       mock.stub('[]').with(:version).and_return(nil)
     end
   end
-  let('api') { double('api') }
+  let('api') { double('Xploy::Api') }
   let('out') { double('stdout').tap { |o| o.stub('puts') } }
+  let('template_class') do
+    double('Xway::Template').tap do |mock|
+      template = double('template').tap do |mock|
+        mock.stub('to_s').and_return('template data...')
+      end
+      mock.stub('new').and_return(template)
+    end
+  end
   before { Xploy.stub('parameter').and_return(parameter) }
-  subject { described_class.new api, out }
-  
+  subject { described_class.new api, out, template_class }
+
   it 'prints usage per default' do
     parameter.should_receive('print_help!')
     subject.start
@@ -25,10 +35,30 @@ describe Xploy::Cli do
     subject.start
   end
 
+  it 'prints template on new without path' do
+    out.should_receive('puts').with('template data...')
+    parameter.stub('rest').and_return(['new'])
+    subject.start
+  end
+
+  it 'writes template on new with path' do
+    FakeFS do
+      parameter.stub('rest').and_return(['new', 'foo.xploy'])
+      subject.start
+      File.read('foo.xploy').should eq('template data...')
+    end
+  end
+
   it 'executes commands on api' do
     api.should_receive('request').with('list').and_return('list result')
     out.should_receive('puts').with('list result')
     parameter.stub('rest').and_return(['list'])
     subject.start
   end
+
+  it 'rescues MissingParameter' do
+    parameter.stub('rest') { raise Xploy::MissingParameter, 'foo' }
+    out.should_receive('puts').with('foo')
+    subject.start
+  end
 end

data/spec/lib/xploy/template_spec.rb

@@ -0,0 +1,6 @@
+require 'spec_helper'
+require 'xploy/template'
+
+describe Xploy::Template do
+  its('to_s') { should eq File.read(File.join(ASSETS_PATH, 'template.json'))}
+end

data/spec/lib/xploy_spec.rb

@@ -3,4 +3,18 @@ require 'xploy'
 
 describe Xploy do
   its('parameter') { should be_kind_of(Xploy::Parameter) }
+
+  describe 'build_cli' do
+    subject { described_class.build_cli }
+
+    it { should be_kind_of(Xploy::Cli) }
+
+    it 'uses Api' do
+      subject.instance_variable_get('@api').should be_kind_of(Xploy::Api)
+    end
+
+    it 'uses STDOUT' do
+      subject.instance_variable_get('@out').should eq STDOUT
+    end
+  end
 end

data/xploy.gemspec

@@ -27,4 +27,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'guard-rspec'
   gem.add_development_dependency 'terminal-notifier-guard'
   gem.add_development_dependency 'coveralls'
+  gem.add_development_dependency 'fakefs'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xploy
 version: !ruby/object:Gem::Version
-  version: 0.1.0.beta
+  version: 0.1.1.beta
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-13 00:00:00.000000000 Z
+date: 2013-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: configliere
@@ -155,6 +155,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: fakefs
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Appway client.
 email:
 - mail@jens-bissinger.de
@@ -167,6 +183,7 @@ files:
 - .gitignore
 - .rspec
 - .travis.yml
+- CHANGELOG.md
 - Gemfile
 - Guardfile
 - LICENSE.txt
@@ -184,11 +201,12 @@ files:
 - lib/xploy/cli.rb
 - lib/xploy/error.rb
 - lib/xploy/parameter.rb
+- lib/xploy/template.rb
 - lib/xploy/version.rb
 - spec/assets/appway-example.json
 - spec/assets/custom.xway
+- spec/assets/template.json
 - spec/integration/bin/xploy_binary_spec.rb
-- spec/integration/lib/xploy/cli_spec.rb
 - spec/lib/xploy/api/endpoints_spec.rb
 - spec/lib/xploy/api/http_spec.rb
 - spec/lib/xploy/api/request/body_spec.rb
@@ -197,6 +215,7 @@ files:
 - spec/lib/xploy/cli_spec.rb
 - spec/lib/xploy/error_spec.rb
 - spec/lib/xploy/parameter_spec.rb
+- spec/lib/xploy/template_spec.rb
 - spec/lib/xploy_spec.rb
 - spec/spec_helper.rb
 - xploy.gemspec
@@ -227,8 +246,8 @@ summary: Provides the xploy command. See github.com/threez/appway.
 test_files:
 - spec/assets/appway-example.json
 - spec/assets/custom.xway
+- spec/assets/template.json
 - spec/integration/bin/xploy_binary_spec.rb
-- spec/integration/lib/xploy/cli_spec.rb
 - spec/lib/xploy/api/endpoints_spec.rb
 - spec/lib/xploy/api/http_spec.rb
 - spec/lib/xploy/api/request/body_spec.rb
@@ -237,6 +256,7 @@ test_files:
 - spec/lib/xploy/cli_spec.rb
 - spec/lib/xploy/error_spec.rb
 - spec/lib/xploy/parameter_spec.rb
+- spec/lib/xploy/template_spec.rb
 - spec/lib/xploy_spec.rb
 - spec/spec_helper.rb
 has_rdoc: 

data/spec/integration/lib/xploy/cli_spec.rb

@@ -1,9 +0,0 @@
-require 'spec_helper'
-require 'xploy'
-
-describe Xploy::Cli do
-  it 'uses api and stdout per default' do
-    subject.instance_variable_get('@api').should be_instance_of(Xploy::Api)
-    subject.instance_variable_get('@out').should eq STDOUT
-  end
-end