grache 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d2581108cdc9537dc91583fc19b49968c5123657
-  data.tar.gz: 3d3feef79badf2ff6fbbdc57031e71e4dd56c008
+  metadata.gz: 142a17fd6cc7a443f637a087f01faf5dd7ffc552
+  data.tar.gz: 7b3552ad7ec801b4ca19ba114195d25732eeed92
 SHA512:
-  metadata.gz: 35438362382c35948695e7af64d61fde442f51173a48ec89c3a2554fad5dcab567023f55199488da8b8c67e7950d254f0ec27bd6d5b08c961c0a451447985849
-  data.tar.gz: 04257ee2e7eebbcb552873e53c3d51d258c7c6bafe38a15cb6633e75bac51a8c08bab35be9a8f34eeee154daa18a3d4457b3306fd51a70cfefcfe188f07bb3cc
+  metadata.gz: 2dcc4af2a35bf18a5e126fa8fc8698c5fd44f06d01407ee7ed54ebab5dadbff22b3e9841bd0cdd8343e7e2e6b95fc3ed0effa0e9fa1d8835039471dcaef3d809
+  data.tar.gz: 0e1c8911b4b5a04b9620042be45f3906dd2d154e16ffe9849d2acede29f35b7aa5ee81ea6bef940a3221121ad3b61f4f450fa822ac044e09cefd2209622d90bb

data/TODO.md

@@ -0,0 +1,4 @@
+# TODO
+
+List of things to ... do? ;-)
+

data/lib/grache.rb

@@ -4,6 +4,6 @@
 require_relative 'grache/version'
 
 # Modules
-require_relative 'grache/cli/cli'
+# require_relative 'grache/cli/cli'
 require_relative 'grache/packer/packer'
 require_relative 'grache/zip/zip'

data/lib/grache/cli/commands/pack_cmd.rb

@@ -31,5 +31,39 @@ Grache::CLI.module_eval do
         Grache::Packer.new.zip
       end
     end
+
+    c.desc 'Deploy created pack'
+    c.command :deploy do |cmd|
+      cmd.desc 'AWS S3 Access Key Id'
+      cmd.default_value nil
+      cmd.flag 'access-key-id'
+
+      cmd.desc 'AWS S3 Secret Access Key'
+      cmd.default_value nil
+      cmd.flag 'secret-access-key'
+
+      cmd.action do |global_options, options, _args|
+        opts = options.merge(global_options)
+
+        access_key_id = opts['access-key-id']
+        secret_access_key = opts['secret-access-key']
+
+        Grache::Packer.new.deploy({access_key_id: access_key_id, secret_access_key: secret_access_key })
+      end
+    end
+
+    c.desc 'Release pack - build, zip, deploy'
+    c.command :release do |cmd|
+      cmd.action do |global_options, options, _args|
+        _opts = options.merge(global_options)
+
+        ['pack build', 'pack zip', 'pack deploy'].each do |act|
+          act_cmd = "#{$0} #{act}"
+          system(act_cmd)
+        end
+
+        # Grache::Packer.new.install
+      end
+    end
   end
 end

data/lib/grache/packer/packer.rb

@@ -1,5 +1,6 @@
 # encoding: utf-8
 
+require 'aws-sdk'
 require 'digest'
 require 'fileutils'
 require 'json'
@@ -17,6 +18,8 @@ require_relative '../zip/zip'
 
 module Grache
   class Packer
+    GEMFILE_RE = Regexp.new(/^\s*gem\s+['"]([^'"]+)['"]\s*,\s*:git\s+=>\s+['"]([^'"]+)['"](\s*,\s*:branch\s+=>\s+['""]([^'"]+)['""])?$/)
+
     DEFAULT_INSTALL_OPTIONS = {
     }
 
@@ -41,7 +44,9 @@ module Grache
       'bundle-pack' => 'bundle pack --gemfile=%s --all',
 
       # gemspec path
-      'gem-build' => 'gem build %s' # spec path
+      'gem-build' => 'gem build %s', # spec path
+
+      'gem-generate-index' => 'gem generate_index'
     }
 
     class << self
@@ -146,6 +151,10 @@ module Grache
         puts "Gemfile located at #{gemfile}" if gemfile
         gem_dir = File.dirname(gemfile)
 
+        gemfile = process_gemfile(gemfile)
+
+        # exit(0)
+
         # TODO: Read gemfile programatically
         uses_gemspec = File.open(gemfile).read.index(/^gemspec$/) != nil
         if(uses_gemspec)
@@ -165,14 +174,79 @@ module Grache
           exec_cmd(cmd)
         end
 
-        cache_dir = File.join(gem_dir, 'vendor')
+        cache_dir = File.join(gem_dir, 'vendor', 'cache')
+        gems_dir = File.join(gem_dir, 'vendor', 'gems')
+
+        # Delete cache directory
         if File.directory?(cache_dir)
           puts "Deleting cache #{cache_dir}"
           FileUtils.rm_rf cache_dir
         end
 
+        FileUtils.mkdir_p cache_dir
+
+        # Move built gems to cache
+        Dir.glob("#{gems_dir}/**/*.gem").each do |gem|
+          dest = File.join(cache_dir, File.basename(gem))
+          puts "Moving #{gem} -> #{dest}"
+          FileUtils.mv(gem, dest)
+        end
+
+        # Pack gems
         cmd = CMDS['bundle-pack'] % gemfile
         exec_cmd(cmd)
+
+        # Generate local gem index, see http://stackoverflow.com/questions/5633939/how-do-i-specify-local-gem-files-in-my-gemfile
+        # Dir.chdir(cache_dir) do
+        #   # Pack gems
+        #   cmd = CMDS['gem-generate-index'] % gemfile
+        #   exec_cmd(cmd)
+        # end
+      end
+
+      def process_gemfile(gemfile_path)
+        new_gemfile = ''
+        git_gems = {}
+        File.open(gemfile_path, 'r') do |f|
+          f.each_line do |l|
+            m = GEMFILE_RE.match(l)
+            if(m)
+              branch = m[4] || 'master'
+              new_gemfile += "gem '#{m[1]}',  :path => './vendor/gems/#{m[1]}'\n"
+              git_gems[m[1]] = {
+                :branch => branch,
+                :git => m[2]
+              }
+            else
+              new_gemfile += l
+            end
+          end
+        end
+        puts new_gemfile
+
+        gem_dir = File.join(File.dirname(gemfile_path), 'vendor', 'gems')
+        FileUtils.mkdir_p gem_dir
+        Dir.chdir(gem_dir) do
+          git_gems.each do |name, gem|
+            FileUtils.rm_rf(name)
+            cmd = "git clone #{gem[:git]} #{name}"
+            puts cmd
+            system cmd
+
+            Dir.chdir(name) do
+              cmd = "git checkout #{gem[:branch]}"
+              puts cmd
+              system cmd
+
+              cmd = "gem build *.gemspec"
+              system(cmd)
+            end
+          end
+        end
+
+        new_gemfile_path = "#{gemfile_path}.Generated"
+        File.open(new_gemfile_path, 'w') { |file| file.write(new_gemfile) }
+        new_gemfile_path
       end
 
       def zip(opts = DEFAULT_ZIP_OPTIONS)
@@ -190,7 +264,8 @@ module Grache
         return unless gemfile
 
         gem_dir = File.dirname(gemfile)
-        vendor_dir = File.join(gem_dir, 'vendor/')
+        gems_dir = File.join(gem_dir, 'gems')
+        vendor_dir = File.join(gem_dir, 'vendor')
 
         unless File.directory?(vendor_dir)
           puts "Vendor directory does not exists. Run 'grache pack build' first!"
@@ -203,6 +278,7 @@ module Grache
         archive = "grache-#{sha}.zip"
         FileUtils.rm archive, :force => true
 
+        # ZipGenerator.new(gems_dir, archive).write
         ZipGenerator.new(vendor_dir, archive).write
 
         puts "Created #{archive}"
@@ -210,6 +286,30 @@ module Grache
     end
 
 
+    def deploy(opts = {access_key_id: nil, secret_access_key: nil})
+      bucket_name = 'gdc-ms-grache'
+
+      access_key_id = opts[:access_key_id]
+      if access_key_id.nil?
+        print 'Access Key ID? '
+        access_key_id = $stdin.gets.chomp
+      end
+
+      secret_access_key = opts[:secret_access_key]
+      if secret_access_key.nil?
+        print 'Secret access key? '
+        secret_access_key = $stdin.gets.chomp
+      end
+
+      s3 = AWS::S3.new(:access_key_id => access_key_id, :secret_access_key => secret_access_key)
+
+      Dir.glob("**/grache-*.zip").each do |grache_file|
+        key = File.basename(grache_file)
+        s3.buckets[bucket_name].objects[key].write(:file => grache_file)
+        puts "Uploading file #{grache_file} to bucket #{bucket_name}."
+      end
+    end
+
     def find_gemfile(path)
       Packer.find_gemfile(path)
     end

data/lib/grache/templates/stub.rb.erb

@@ -0,0 +1,50 @@
+#! /usr/bin/env ruby
+
+require 'bundler/cli'
+require 'fileutils'
+
+require_relative 'core'
+
+$SCRIPT_PARAMS ||= {}
+
+FETCH_GEMS = $SCRIPT_PARAMS['FETCH_GEMS'] || true
+
+repo_gems = [
+        'https://github.com/korczis/grache/archive/master.zip'
+]
+
+if FETCH_GEMS
+    repo_gems.each do |repo_gem|
+        cmd = "curl -LOk --retry 3 #{repo_gem} 2>&1"
+        puts cmd
+        system(cmd)
+
+        repo_gem_file = repo_gem.split('/').last
+
+        cmd = "unzip -o #{repo_gem_file} 2>&1"
+        puts cmd
+        system(cmd)
+
+        FileUtils.rm repo_gem_file
+    end
+end
+
+grash('cp -a grache-master/lib/* .')
+
+require_relative 'grache'
+
+puts "Grache::VERSION = #{Grache::VERSION}"
+
+# Fetch grache pack
+Grache::Packer.new.install
+
+Grache::Packer.new.install()
+Bundler::CLI.new.invoke(:install, [], :gemfile => 'Gemfile', :local => true, :deployment => true, :verbose => true, :binstubs => './bin')
+# require 'bundler/setup'
+
+grash('cat .bundle/config')
+
+# Show installed gems
+Bundler::CLI.new.invoke(:show, [], :verbose => true)
+
+require_relative './main.rb'

data/lib/grache/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Grache
-  VERSION = '0.0.11'
+  VERSION = '0.0.12'
 end

data/lib/grache/zip/zip_generator.rb

@@ -23,16 +23,20 @@ module Grache
     end
 
     # Zip the input directory.
-    def write()
-      entries = Dir.entries(@inputDir); entries.delete('.'); entries.delete('..')
+    def write(root = '')
+      entries = Dir.entries(@inputDir)
+      entries.delete('.')
+      entries.delete('..')
+
       io = Zip::File.open(@outputFile, Zip::File::CREATE);
-      writeEntries(entries, '', io)
+      writeEntries(entries, '', io, root)
       io.close();
     end
 
     # A helper method to make the recursion work.
     private
-    def writeEntries(entries, path, io)
+
+    def writeEntries(entries, path, io, root = '')
       entries.each { |e|
         zipFilePath = path == '' ? e : File.join(path, e)
         diskFilePath = File.join(@inputDir, zipFilePath)
@@ -40,10 +44,18 @@ module Grache
 
         if File.directory?(diskFilePath)
           io.mkdir(zipFilePath)
-          subdir =Dir.entries(diskFilePath); subdir.delete('.'); subdir.delete('..')
+
+          subdir = Dir.entries(diskFilePath)
+          subdir.delete('.')
+          subdir.delete('..')
+
           writeEntries(subdir, zipFilePath, io)
         else
-          io.get_output_stream(zipFilePath) { |f| f.print(File.open(diskFilePath, 'rb').read()) }
+          iop = root.empty? ? zipFilePath : File.join(root, zipFilePath)
+          # puts "IOP: #{iop}"
+          io.get_output_stream(iop) do |f|
+            f.print(File.open(diskFilePath, 'rb').read())
+          end
         end
       }
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grache
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Tomas Korcak
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-02-11 00:00:00.000000000 Z
+date: 2015-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coveralls
@@ -464,6 +464,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- TODO.md
 - bin/grache
 - lib/grache.rb
 - lib/grache/bundler/bundler.rb
@@ -473,6 +474,7 @@ files:
 - lib/grache/cli/hooks.rb
 - lib/grache/cli/shared.rb
 - lib/grache/packer/packer.rb
+- lib/grache/templates/stub.rb.erb
 - lib/grache/version.rb
 - lib/grache/zip/zip.rb
 - lib/grache/zip/zip_generator.rb