rappa 0.0.7 → 0.0.8

data/README.md

@@ -95,6 +95,12 @@ An example would be to have a thin project which uses Rake and has the following
 
 (Recommended that you bundle package instead of putting a bundle install in the bootstrap.sh though)
 
+### Troubleshooting
+
+If you get an error related to zip/zip or rubyzip try adding this into your Gemfile when using the rappa gem directly
+
+gem 'rubyzip', '< 1.0.0'
+
 ### Rap file
 
 ./rap.yml
@@ -120,12 +126,14 @@ Once you have your rap.yml in the root of your project you must navigate one lev
 
 This packages your application. You need a rap.yml in the root of your project and must be executed from one level up from your application e.g.
 
-     rappa package -i path/to/your/app -o path/to/destination
+     rappa package -i path/to/your/app -o path/to/destination -e 'file1,folder1'
 
 The -i is for input directory and the -o is for output directory e.g.
 
      rappa package -i ./myapp -o .
 
+The -e is to specify files and folders to exclude from the package and it's optional
+
 Will produce a myapp.rap in the current directory. The name of the folder of your application is what will be used in the rap archive.
 
 ### expand

data/bin/rappa

@@ -49,6 +49,38 @@ elsif Settings.rest.include?('expand')
       exit 1
     end
   end
+elsif Settings.rest.include?('standalone_package')
+  if Settings[:input_directory].nil?
+    puts '[ERROR] You must supply an input directory for package with -i e.g. rappa standalone_package -i /path/to/project'
+    exit 1
+  elsif Settings[:output_directory].nil?
+    puts '[ERROR] You must supply an output directory for package with -o e.g. rappa standalone_package -o /path/to/output/location'
+    exit 1
+  else
+    begin
+      Rappa.new(Settings).standalone_package
+      puts '[SUCCESS] packaged standalone zip successfully'
+    rescue RappaError => e
+      puts "[ERROR] Could not continue package because: #{e}"
+      exit 1
+    end
+  end
+elsif Settings.rest.include?('standalone_expand')
+  if Settings[:input_archive].nil?
+    puts '[ERROR] You must supply an input .zip archive for standalone_expand with -a e.g. rappa standalone_expand -a /path/to/.zip'
+    exit 1
+  elsif Settings[:output_archive].nil?
+    puts '[ERROR] You must supply an output archive directory for standalone_expand with -d e.g. rappa standalone_expand -d /path/to/output/location'
+    exit 1
+  else
+    begin
+      Rappa.new(Settings).standalone_expand
+      puts '[SUCCESS] expanded standalone zip successfully'
+    rescue RappaError => e
+      puts "[ERROR] Could not continue expand because: #{e}"
+      exit 1
+    end
+  end
 elsif Settings.rest.include?('generate')
   Rappa.new.generate
   puts '[SUCCESS] generated sample.rap.yml into current directory'
@@ -75,8 +107,8 @@ else
   info=<<-EOF
 
 ---------------------------------------------------------------------------------
-Rappa Version: 0.0.7
-Released: 17 November 2013
+Rappa Version: 0.0.8
+Released: 19 November 2013
 ---------------------------------------------------------------------------------
 
 Usage:
@@ -114,6 +146,8 @@ Usage:
 
 Info:
 
+  To package/expand/deploy a standalone zip archive use standalone_package/standalone_expand/standalone_deploy in place of package,expand and deploy
+
   For more information on how to use rappa please visit:
     https://github.com/masterthought/rappa
 

data/src/property_validator.rb

@@ -40,6 +40,12 @@ class PropertyValidator
     @config[:input_rap]
   end
 
+  def input_zip
+    check_property(@config[:input_zip], :input_zip)
+    raise RappaError, "input zip: #{@config[:input_zip]} does not exist" unless @file.exists?(@config[:input_zip])
+    @config[:input_zip]
+  end
+
   def url
     check_property(@config[:url], :url)
     @config[:url]

data/src/rap_validator.rb

@@ -22,6 +22,12 @@ class RapValidator
     raise RappaError, "input archive: #{input_archive} is not a valid .rap archive" unless extension == '.rap'
   end
 
+  def validate_is_zip_archive(file, input_archive)
+    base_name = file.basename(input_archive)
+    extension = file.extname(base_name)
+    raise RappaError, "input archive: #{input_archive} is not a valid .zip archive" unless extension == '.zip'
+  end
+
   private
 
   def validate_details

data/src/rappa.rb

@@ -11,7 +11,7 @@ class Rappa
     @config = config
     @file = file
     @rest_client = rest_client
-    @property_validator= property_validator.new(@config,@file)
+    @property_validator= property_validator.new(@config, @file)
     @rap_validator = rap_validator.new(@file)
   end
 
@@ -28,7 +28,7 @@ class Rappa
   def expand
     input_archive = @property_validator.input_archive
     output_directory = @property_validator.output_archive
-    @rap_validator.validate_is_rap_archive(@file,input_archive)
+    @rap_validator.validate_is_rap_archive(@file, input_archive)
     FileUtils.mkdir_p output_directory unless @file.exists?(output_directory)
     expand_zip
   end
@@ -37,9 +37,35 @@ class Rappa
     input_rap = @property_validator.input_rap
     api_key = @property_validator.api_key
     url = @property_validator.url
+    @rap_validator.validate_is_rap_archive(@file, input_rap)
     @rest_client.put "#{url}?key=#{ api_key}", :file => @file.new(input_rap)
   end
 
+  def standalone_package
+    input_directory = @property_validator.input_directory
+    output_directory = @property_validator.output_directory
+    FileUtils.mkdir_p output_directory unless @file.exists?(output_directory)
+    name = "#{output_directory}/#{@config[:file_name]}.zip"
+    @property_validator.validate_name(name)
+    package_zip(input_directory, name)
+  end
+
+  def standalone_expand
+    input_archive = @property_validator.input_archive
+    output_directory = @property_validator.output_archive
+    @rap_validator.validate_is_zip_archive(@file, input_archive)
+    FileUtils.mkdir_p output_directory unless @file.exists?(output_directory)
+    expand_zip
+  end
+
+  def standalone_deploy
+    input_zip = @property_validator.input_zip
+    api_key = @property_validator.api_key
+    url = @property_validator.url
+    @rap_validator.validate_is_zip_archive(@file, input_zip)
+    @rest_client.put "#{url}?key=#{ api_key}", :file => @file.new(input_zip)
+  end
+
   def generate
     sample = {:name => 'App Name', :description => 'App Description', :version => '1', :server_type => 'thin', :start_script => 'start.sh', :stop_script => 'stop.sh', :pids => 'tmp/pids', :bootstrap => 'bootstrap.sh', :excludes => %w(file1 folder1)}
     @file.open('sample.rap.yml', 'w') { |f| f.puts sample.to_yaml }
@@ -67,7 +93,7 @@ class Rappa
   def package_zip(input_directory, name)
     Zip::ZipFile.open(name, Zip::ZipFile::CREATE) do |zip_file|
       glob = Dir[@file.join(input_directory, '**', '**')]
-      @property_validator.excludes.each{|ex| glob.reject!{|f| f[input_directory + ex]}}
+      @property_validator.excludes.each { |ex| glob.reject! { |f| f[input_directory + ex] } }
       glob.each do |file|
         zip_file.add(file.sub(input_directory, ''), file)
       end
@@ -81,5 +107,4 @@ class Rappa
   end
 
 
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rappa
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-11 00:00:00.000000000 Z
+date: 2013-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec