rubypack 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1643d283312bf9a5252d4c64dfc40e98159bbbe0
-  data.tar.gz: a41e70151492acba18ae7c2cc56de25e3a37628b
+  metadata.gz: 42235b3189090f26621ada9ac9ab740cbf97890a
+  data.tar.gz: 2b515af6d5ae52391fad4d95581ccdca82f4a0cf
 SHA512:
-  metadata.gz: 2676e5b9715aad2a76c2ed5981c26ea0d30f10abb8a67102d46c5cccec0290f6ed862be3d66b6f45c85e395ca13292b879d8dca1c7e5796865b7b349ef6387bd
-  data.tar.gz: fa072c36bbcfaa376a266920ffac91e16e169bcbba49ff29161a4189ca95a9bbcb9d05f6d47e10ff7c20b11e4e8c91b9bf8b49a2d820fa234e97b07e6ccc5e9a
+  metadata.gz: 28a006b1e1ea8a2bc47254cb1c07dda03683ca5f8d0fda82b30a30c6e8fbeb94c90b15c9116a9bdea2a58ed38fd897fe8bbffd1cb6864f7135d7c723f7c7bee3
+  data.tar.gz: d3194b7101d72188c25548dcf2bc328453a48abb5e02c9e6ec717063931767f2ea457c3d5d88ab2222c1d9169dd1d2417f2d992b57c10c5dd9b6edebd1dc6130

data/README.md

@@ -28,11 +28,12 @@ The content of the `.rubypack` file:
 name 'TestApp'
 version '3.1'
 
+include git
 exclude '*.log'
 include 'js/node_modules/**/**'
 ```
 
-Please note that if the first instruction among include/exclude is *include*, then the strategy to select the files will start with zero files and start applying the filters. However if the first instruction is a *exclude*, the selection of files will start with ALL files and start applying the filters in order.
+Please note that if the first filter among include/exclude is *include*, then the strategy to select the files will start with zero files and continue applying the filters in order appearance. However if the first filter is *exclude*, the selection of files will start with ALL files and continue applying the reamining of the filters.
 
 Then run the following command to build your package:
 
@@ -76,7 +77,7 @@ To view more details about what is happening, you can use the `--verbose` switch
 
 ### Available commands
 
-```bash
+```
 $ rubypack --help
 RubyPack 0.1.0 (c) 2017 Jorge del Rio
 A ruby package generation and execution manager.
@@ -92,7 +93,7 @@ Options:
 
 ### Build command
 
-```bash
+```
 $ rubypack build --help
 build - Builds a package of your application.
 
@@ -108,7 +109,7 @@ Options:
 
 ### Deploy command
 
-```bash
+```
 $ rubypack deploy --help
 deploy - Install the application package and all the gems.
 
@@ -132,6 +133,56 @@ Options:
   -h, --help          Show this message
 ```
 
+## Configuration file
+
+The configuration file `.rubypack` is used to determinate which will be included in the final package file.
+
+The *name* and *version* methods are used to define the final name of the package. For example: `MyApp-1.2.0.tgz.rpack`
+
+```ruby
+name 'MyApp'
+version '1.2.0'
+```
+
+You can rubypack configuration is a ruby file than can contain any code. Therefore, you can set the version using the definition in another file.
+
+```
+require 'version.rb'
+
+name 'MyApp'
+version MyApp::VERSION
+```
+
+The *git* keyword fetches all the files in the repository using the following command: `` `git ls-files -z\`.split("\x0") ``
+
+```ruby
+include git
+```
+
+The *all* keyword fetches all the files using the wildcards `**/**`.
+
+```ruby
+include all
+```
+
+To include a specific file, simple write the relative URL to the file.
+
+```
+include 'Myfile.txt'
+```
+
+It is possible to include several filters in the same line.
+
+```
+include git, 'js/node_modules', 'public/**/**'
+```
+
+The order of the include/exclude instructions matters. The filters are applied in order of appearance. For example, to select only the files not tracked by git:
+
+```
+include all
+exclude git
+```
 
 ## Development
 

data/bin/rubypack

@@ -1,8 +1,10 @@
 #!/usr/bin/env ruby
 
-require 'bundler/setup'
-require 'trollop'
-require 'rubypack'
+Dir.chdir(File.dirname(__FILE__)) do
+  require 'bundler/setup'
+  require 'trollop'
+  require 'rubypack'
+end
 
 SUB_COMMANDS = %w(build deploy list)
 global_opts = Trollop::options do

data/lib/rubypack/builder.rb

@@ -59,6 +59,7 @@ module Rubypack
     def generate_list_of_files(pack)
       @output.step('Generating list of files...') do
         pack.include(pack.filename)
+        pack.include('Gemfile')
         pack.include('Gemfile.lock')
         pack.include('vendor/cache/*')
         all_files = pack.list_files

data/lib/rubypack/bundler_controller.rb

@@ -7,33 +7,29 @@ module Rubypack
 
     def package
       begin
-        old_pwd = Dir.pwd
-        Dir.chdir(@path)
-        IO.popen(['bundle', 'package', '--all-platforms', '--all', err: [:child, :out]]) do |out|
-          yield(out)
+        Dir.chdir(@path) do 
+          IO.popen(['bundle', 'package', '--all-platforms', '--all', err: [:child, :out]]) do |out|
+            yield(out)
+          end
+          fail("bundle package failed: #{$?.exitstatus}") unless $?.exitstatus == 0
+          true
         end
-        fail("bundle package failed: #{$?.exitstatus}") unless $?.exitstatus == 0
-        true
       rescue => error
         fail("Error executing bundle package: #{error.message}")
-      ensure
-        Dir.chdir(old_pwd)
       end
     end
 
     def install
       begin
-        old_pwd = Dir.pwd
-        Dir.chdir(@path)
-        IO.popen(['bundle', 'install', '--local', '--deployment', err: [:child, :out]]) do |out|
-          yield(out)
+        Dir.chdir(@path) do 
+          IO.popen(['bundle', 'install', '--local', '--deployment', err: [:child, :out]]) do |out|
+            yield(out)
+          end
+          fail("bundle install failed: #{$?.exitstatus}") unless $?.exitstatus == 0
+          true
         end
-        fail("bundle install failed: #{$?.exitstatus}") unless $?.exitstatus == 0
-        true
       rescue => error
         fail("Error executing bundle install: #{error.message}")
-      ensure
-        Dir.chdir(old_pwd)
       end
     end
   end

data/lib/rubypack/compressor.rb

@@ -26,15 +26,13 @@ module Rubypack
 
       begin
         filename = File.expand_path(output_filename + @compressor.extension)
-        old_pwd = Dir.pwd
-        Dir.chdir(path)
-        @compressor.compress(filename: filename) do |out|
-          while line = out.gets do
-            @output.verbose(' >', line)
+        Dir.chdir(path) do
+          @compressor.compress(filename: filename) do |out|
+            while line = out.gets do
+              @output.verbose(' >', line)
+            end
           end
         end
-      ensure
-        Dir.chdir(old_pwd)
       end
 
       @output.status(' File created: ', filename)
@@ -51,15 +49,13 @@ module Rubypack
 
       begin
         full_filename = File.expand_path(filename)
-        old_pwd = Dir.pwd
-        Dir.chdir(directory)
-        @compressor.decompress(filename: full_filename) do |out|
-          while line = out.gets do
-            @output.verbose(' >', line)
+        Dir.chdir(directory) do
+          @compressor.decompress(filename: full_filename) do |out|
+            while line = out.gets do
+              @output.verbose(' >', line)
+            end
           end
         end
-      ensure
-        Dir.chdir(old_pwd)
       end
 
       @output.status(' Directory created: ', directory)

data/lib/rubypack/rubypack_file.rb

@@ -31,20 +31,28 @@ module Rubypack
       "#{@name}-#{@version}"
     end
 
-    def run(command)
-      @command = command
-    end
-
     def include(*args)
+      args.flatten!
       @rules = [] unless defined?(@rules)
       args.each { |entry| @rules << { action: :include, filter: entry } }
     end
 
     def exclude(*args)
+      args.flatten!
       @rules = [] unless defined?(@rules)
       args.each { |entry| @rules << { action: :exclude, filter: entry } }
     end
 
+    def all
+      '**/**'
+    end
+
+    def git
+      Dir.chdir(@path) do
+        `git ls-files -z`.split("\x0")
+      end
+    end
+
     def format_rule(rule, files)
       @output.status(" Action: #{rule[:action]}, Filter: #{rule[:filter]}")
       icon = (rule[:action] == :include) ? '  +' : '  -'
@@ -52,49 +60,47 @@ module Rubypack
     end
 
     def list_files
-      old_pwd = Dir.pwd
-      Dir.chdir(@path)
-
-      # If not rules were defined, include all by default
-      unless defined?(@rules)
-        files = Dir['**/**']        
-        format_rule({ action: :include, filter: '**/**' }, files)
-        return ffiles
-      end
+      Dir.chdir(@path) do
 
-      # Determinate if the package must start with all files or with none
-      action = @rules.first[:action]
-      if action == :include
-        files = []
-      elsif action == :exclude
-        files = Dir['**/**']
-        format_rule({ action: :include, filter: '**/**' }, files)
-      else
-        fail("Action not implemented: #{action}")
-      end
+        # If not rules were defined, include all by default
+        unless defined?(@rules)
+          files = Dir['**/**']        
+          format_rule({ action: :include, filter: '**/**' }, files)
+          return ffiles
+        end
 
-      # Include/exclude based on the rules
-      @rules.each do |rule|
-        if rule[:action] == :include
-          filtered_files = Dir[rule[:filter]]
-          files |= filtered_files
-          format_rule(rule, filtered_files)
-        elsif rule[:action] == :exclude
-          filtered_files = Dir[rule[:filter]]
-          files -= filtered_files
-          format_rule(rule, filtered_files)
+        # Determinate if the package must start with all files or with none
+        action = @rules.first[:action]
+        if action == :include
+          files = []
+        elsif action == :exclude
+          files = Dir['**/**']
+          format_rule({ action: :include, filter: '**/**' }, files)
         else
-          fail("Action not implemented: #{rule[:action]}")
+          fail("Action not implemented: #{action}")
         end
-      end
 
-      # Remove directories
-      files.reject! { |file| File.directory?(file) }
+        # Include/exclude based on the rules
+        @rules.each do |rule|
+          if rule[:action] == :include
+            filtered_files = Dir[rule[:filter]]
+            files |= filtered_files
+            format_rule(rule, filtered_files)
+          elsif rule[:action] == :exclude
+            filtered_files = Dir[rule[:filter]]
+            files -= filtered_files
+            format_rule(rule, filtered_files)
+          else
+            fail("Action not implemented: #{rule[:action]}")
+          end
+        end
+
+        # Remove directories
+        files.reject! { |file| File.directory?(file) }
 
-      # Sort the file names
-      files.sort
-    ensure
-      Dir.chdir(old_pwd)
+        # Sort the file names
+        files.sort
+      end
     end
 
   end

data/lib/rubypack/version.rb

@@ -1,3 +1,3 @@
 module Rubypack
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubypack
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Jorge del Rio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-23 00:00:00.000000000 Z
+date: 2017-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler