disclose 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 147ded056232e909f26a55163895b1fd1ef6f0d1
-  data.tar.gz: 29572d9b133fab795a0ff679bedd26e5e783d169
+  metadata.gz: 12b6c9cb872ab8098620fb864c7a507cc1ffe53f
+  data.tar.gz: 521c3c4d2f170c39c58939f0d36ef5ec24e06a9c
 SHA512:
-  metadata.gz: efd56b7015ed9c502bcf06891227d92163c4ff6f7707504a6fdaf1ba73482be893ad92deeb4484a91e8903d581c439072f614e76ad4936b6513de0f0af99a15d
-  data.tar.gz: d5ca60829d3f3d7d4dc628349f682d11fa08d3d700524b96c10be903aa6ad271907e193df073c16fafc86209628479bad3155ee38f5342b5542e1a65df50b3ef
+  metadata.gz: ac677eb6eb07cc39cff5d09ee0699c04ba3dfea7f1e0244987bdb02a254e3b9da200d6b09dfa17db0ba015f6f0c4da174df4649867deab005bc743c704689a8a
+  data.tar.gz: 39cc60843db112afad3a2020c29cc3ae02547859565d08999acd9f068ee4b815e0ef7bbad3f15fc8688372047a06cc85e6ee958577a433222c395be084bbd85e

data/README.md

@@ -12,12 +12,26 @@ Pack your Node.js project into an executable without recompiling Node.js.
 
     $ gem install disclose
 
+## Dependencies
+
+Make sure that your system has the following components,
+
+- tar
+- xxd
+- cc or cl.exe
+
 ## Usage
 
     $ disclose [node_path] [project_path]
 
 ## Example
 
+On Windows,
+
+    > disclose "C:\Program Files\nodejs\node.exe" "Z:\node_modules\coffee-script"
+
+On Unix,
+
     $ disclose /usr/local/bin/node /usr/local/lib/node_modules/coffee-script
 
 ## License

data/disclose.gemspec

@@ -14,7 +14,26 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/pmq20/disclose"
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.files         = [
+                         '.gitignore',
+                         '.rspec',
+                         '.travis.yml',
+                         'Gemfile',
+                         'LICENSE',
+                         'README.md',
+                         'Rakefile',
+                         'bin/console',
+                         'bin/setup',
+                         'disclose.gemspec',
+                         'exe/disclose',
+                         'lib/disclose.rb',
+                         'lib/disclose/c.rb',
+                         'lib/disclose/libiconv_2_dll.h',
+                         'lib/disclose/libintl_2_dll.h',
+                         'lib/disclose/tar_exe.h',
+                         'lib/disclose/version.rb',
+                         'lib/disclose/windows.rb',
+                       ]
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]

data/lib/disclose.rb

@@ -42,9 +42,8 @@ Usage: disclose [node_path] [project_path]
   end
 
   def tar!
-    chdir(@project_path) do
-      @tar_path = "#{@working_dir}/tar.tar"
-      exe("tar cf #{Shellwords.escape(@tar_path)} . -C #{Shellwords.escape File.dirname @node_path} #{Shellwords.escape File.basename @node_path}")
+    chdir(@working_dir) do
+      exe("tar cf tar.tar -C \"#{@project_path}\" . -C \"#{File.dirname @node_path}\" \"#{File.basename @node_path}\"")
     end
   end
   
@@ -62,7 +61,11 @@ Usage: disclose [node_path] [project_path]
         File.open("#{key}.c", "a") do |f|
           C.src(f, value, @md5)
         end
-        exe("cc #{key}.c -o #{key}")
+        if Gem.win_platform?
+          exe("cl.exe #{key}.c")
+        else
+          exe("cc #{key}.c -o #{key}")
+        end
 
         puts "======= Success ======="
         puts File.join(@working_dir, key)

data/lib/disclose/c.rb

@@ -1,51 +1,107 @@
 class Disclose
   module C
     class << self
+      def unistd
+        if Gem.win_platform?
+          %q{
+            #include <stdlib.h>
+            #include <io.h>
+            #include <process.h> /* for getpid() and the exec..() family */
+            #include <direct.h> /* for _getcwd() and _chdir() */
+          }
+        else
+          %q{
+            #include <unistd.h>
+          }
+        end
+      end
+
+      def slash
+        Gem.win_platform? ? %q{\\\\} : '/'
+      end
+
       def src(f, name, md5)
         windows_prepare(f) if Gem.win_platform?
-
+        f.puts unistd
         f.puts %Q{
-          #include <unistd.h>
           #include <stdio.h>
           #include <stdlib.h>
           #include <assert.h>
           #include <sys/types.h>
           #include <sys/stat.h>
 
+          char *tmp_prefix;
+          char md5_path[1024];
+          char cwd_path[1024];
+
+          void get_tmp_prefix() {
+            tmp_prefix = getenv("TMPDIR");
+            if (NULL != tmp_prefix) return;
+            tmp_prefix = getenv("TMP");
+            if (NULL != tmp_prefix) return;
+            tmp_prefix = getenv("TEMP");
+            if (NULL != tmp_prefix) return;
+            tmp_prefix = cwd_path;
+          }
+
           void untar() {
-            char cmd[256] = {0};
-            char file[] = "/tmp/disclose.file.XXXXXX";
-            char dir[] = "/tmp/disclose.dir.XXXXXX";
+            char cmd[1024] = {0};
+            char file[1024] = {0};
+            char dir[1024] = {0};
             FILE *fp = NULL;
             int ret;
 
+            // Be careful about the number of XXXXXX
+            // Relate to the magical number 20 below.
+            snprintf(file, 1023, "%s#{slash}disclose.file.XXXXXX", tmp_prefix);
+            snprintf(dir, 1023, "%s#{slash}disclose.dir.XXXXXX", tmp_prefix);
+
             mktemp(file);
-            mkdtemp(dir);
+            mktemp(dir);
+            mkdir(dir#{', 0777' unless Gem.win_platform?});
 
             fp = fopen(file, "wb");
             assert(fp);
             fwrite(tar_tar, sizeof(unsigned char), sizeof(tar_tar), fp);
             fclose(fp);
 
-            #{Gem.win_platform? ? tar_windows : tar}
+            #{tar_windows if Gem.win_platform?}
 
-            rename(dir, "/tmp/disclose.#{md5}");
+            chdir(tmp_prefix);
+
+            snprintf(cmd, 1023, "tar xf \\"%s\\" -C \\"%s\\"", file + strlen(file) - 20, dir + strlen(dir) - 20);
+            ret = system(cmd);
+            assert(0 == ret);
+
+            chdir(cwd_path);
+
+            rename(dir, md5_path);
           }
 
           int main(int argc, char const *argv[]) {
             char **argv2 = NULL;
             int i, index;
             struct stat info;
+            char arg0[1024] = {0};
+            char arg1[1024] = {0};
 
-            if( stat( "/tmp/disclose.#{md5}", &info ) != 0 )
+            getcwd(cwd_path, sizeof(cwd_path));
+            get_tmp_prefix();
+            snprintf(md5_path, 1023, "%s#{slash}disclose.#{md5}", tmp_prefix);
+
+            if( stat( md5_path, &info ) != 0 )
                 untar();
 
-            assert(0 == stat( "/tmp/disclose.#{md5}", &info ) && info.st_mode & S_IFDIR);
+            assert(0 == stat( md5_path, &info ) && info.st_mode & S_IFDIR);
 
             argv2 = malloc(sizeof(char*) * (argc + 10));
             assert(argv2);
-            argv2[0] = "/tmp/disclose.#{md5}/node";
-            argv2[1] = "/tmp/disclose.#{md5}/#{name}";
+
+            snprintf(arg0, 1023, "%s#{slash}node", md5_path);
+            snprintf(arg1, 1023, "%s#{slash}#{name}", md5_path);
+
+            argv2[0] = arg0;
+            argv2[1] = arg1;
             index = 2;
             for (i = 1; i < argc; ++i) {
               argv2[index] = argv[i];
@@ -59,20 +115,14 @@ class Disclose
         }
       end
       
-      def tar
-        %Q{
-          snprintf(cmd, 255, "tar xf %s -C %s", file, dir);
-          ret = system(cmd);
-          assert(0 == ret);
-        }
-      end
-      
       def tar_windows
         %Q{
-          char tardir[] = "/tmp/disclose.tardir.XXXXXX";
+          char tardir[1024];
+          snprintf(tardir, 1023, "%s#{slash}disclose.tardir.XXXXXX", tmp_prefix);
+          mktemp(tardir);
+          mkdir(tardir);
 
-          ret = chdir(tardir);
-          assert(0 == ret);
+          chdir(tardir);
 
           fp = fopen("libiconv_2.dll", "wb");
           assert(fp);
@@ -89,9 +139,7 @@ class Disclose
           fwrite(tar_exe, sizeof(unsigned char), sizeof(tar_exe), fp);
           fclose(fp);
 
-          snprintf(cmd, 255, "tar xf %s -C %s", file, dir);
-          ret = system(cmd);
-          assert(0 == ret);
+          chdir(cwd_path);
         }
       end
       

data/lib/disclose/version.rb

@@ -1,3 +1,3 @@
 class Disclose
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: disclose
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - The rugged tests are fragile
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-07 00:00:00.000000000 Z
+date: 2016-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler