gitignore_rb 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8396d599d3e691008f1143d27f12cf2346e3e176
-  data.tar.gz: 39290eba069beb20a7fd5e6ea9c72d0b42b3a839
+  metadata.gz: ced7dcd87b4e70f51c598a77fda9f4443014e884
+  data.tar.gz: cd04335666b8b030c59618be05268ebf0cb372cf
 SHA512:
-  metadata.gz: 8ee7bd401e7bce01edd422d4aeb66963f426da37a7c87739fa73cb55d736972d39b3561b6a7e6f4b000b41edf12d9963952d5c54b2b063dff559f86563781082
-  data.tar.gz: 629c661de017d7f06b7eff07adc9efe19f2efd5c5755d37489b2031f1ecdba632d65de5cd6d7a7131fca07bae1f66f9c3f4290ec76b55defd1efb638423a9ea2
+  metadata.gz: 3028d368ecfb36abd3fa82f963714e940073c37d9de35fa20917bc748073c1b5940e352cb9464d879155504d258eb3771d139edc5586d92366567680bbaf0dc5
+  data.tar.gz: 6283768e29b85d933a5828405e5adfcb9c2316231df7a41f3c4b8363eea40950b048af7b576d372087459400d9a790e02e6f695ffc3a49e1c401c9e34faa02a7

data/README.md

@@ -1,4 +1,4 @@
-# gitignore.rb [![Build Status](https://travis-ci.org/nathankleyn/gitignore.rb.svg)](https://travis-ci.org/nathankleyn/gitignore.rb)
+# gitignore.rb [![Build Status](https://travis-ci.org/nathankleyn/gitignore.rb.svg)](https://travis-ci.org/nathankleyn/gitignore.rb) [![RubyGems Version Of gitignore_rb](https://img.shields.io/gem/v/gitignore_rb.svg)](https://rubygems.org/gems/gitignore_rb)
 
 This is an implementation of `.gitignore` parsing and matching in Rust. Use this library if you want to check whether a given path would be excluded by a `.gitignore` file.
 

data/ext/gitignore_binding/Rakefile

@@ -1 +1,29 @@
-# FIXME: Make this check for presence of `rustc` and compile the library.
+LIB_PATH = 'target/release/libgitignore_binding.dylib'
+
+desc 'Ensure rustc is present and is callable on the current PATH.'
+task :check_rustc do
+  puts 'Checking for rustc...'
+  unless system 'rustc --version'
+    fail 'Could not find rustc on your path, please check you have it installed.'
+  end
+end
+
+desc 'Ensure cargo is present and is callable on the current PATH.'
+task :check_cargo do
+  puts 'Checking for cargo...'
+  unless system 'cargo --version'
+    fail 'Could not find cargo on your path, please check you have it installed.'
+  end
+end
+
+desc 'Execute cargo build to construct the dynamic library.'
+task :build do
+  unless system 'cargo build --release'
+    fail 'Could not execute cargo build successfully, please check the logs and try again.'
+  end
+end
+
+file LIB_PATH => :build
+
+desc 'Build the dynamic library.'
+task default: LIB_PATH

data/ext/gitignore_binding/src/lib.rs

@@ -1,13 +1,11 @@
-#![feature(cstr_to_str)]
-#![feature(cstr_memory)]
-
 extern crate gitignore;
 extern crate libc;
 
 use std::ffi::CStr;
 use std::ffi::CString;
 use std::mem;
-use std::path::Path;
+use std::path::{Path, PathBuf};
+use std::string::FromUtf8Error;
 
 #[repr(C)]
 pub struct RubyArray {
@@ -28,14 +26,28 @@ impl RubyArray {
 
 #[no_mangle]
 pub extern "C" fn included_files(path_ptr: *const libc::c_char) -> RubyArray {
-    let path_cstr = unsafe { CStr::from_ptr(path_ptr) };
-    let path_and_str = path_cstr.to_str().unwrap();
-    let path = Path::new(path_and_str).to_path_buf();
+    let path_string = ptr_to_string(path_ptr).unwrap();
+    let path = Path::new(&*path_string).to_path_buf();
 
     let gitignore_path = path.join(".gitignore");
     let file = gitignore::File::new(&gitignore_path).unwrap();
 
-    RubyArray::from_vec(file.included_files().unwrap().iter().map(|f|
-        CString::new(f.to_str().unwrap()).unwrap().into_raw()
-    ).collect())
+    let files = file.included_files().unwrap();
+    println!("{:?}", files);
+    RubyArray::from_vec(paths_to_ptrs(files))
+}
+
+fn ptr_to_string(ptr: *const libc::c_char) -> Result<String, FromUtf8Error> {
+    let cstr = unsafe { CStr::from_ptr(ptr) };
+    let mut bytes = Vec::new();
+    bytes.extend(cstr.to_bytes());
+
+    String::from_utf8(bytes)
+}
+
+fn paths_to_ptrs(paths: Vec<PathBuf>) -> Vec<*const libc::c_char> {
+    paths.iter().flat_map(|p| p.to_str())
+                .flat_map(|s| CString::new(s))
+                .map(|cs| cs.as_ptr())
+                .collect()
 }

data/ext/gitignore_binding/target/debug/build/advapi32-sys-cfef7a1f30f1e5f6/build_script_build.dSYM/Contents/Info.plist

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+	<dict>
+		<key>CFBundleDevelopmentRegion</key>
+		<string>English</string>
+		<key>CFBundleIdentifier</key>
+		<string>com.apple.xcode.dsym.build_script_build</string>
+		<key>CFBundleInfoDictionaryVersion</key>
+		<string>6.0</string>
+		<key>CFBundlePackageType</key>
+		<string>dSYM</string>
+		<key>CFBundleSignature</key>
+		<string>????</string>
+		<key>CFBundleShortVersionString</key>
+		<string>1.0</string>
+		<key>CFBundleVersion</key>
+		<string>1</string>
+	</dict>
+</plist>

data/ext/gitignore_binding/target/debug/libgitignore_binding.dylib.dSYM/Contents/Info.plist

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+	<dict>
+		<key>CFBundleDevelopmentRegion</key>
+		<string>English</string>
+		<key>CFBundleIdentifier</key>
+		<string>com.apple.xcode.dsym.libgitignore_binding.dylib</string>
+		<key>CFBundleInfoDictionaryVersion</key>
+		<string>6.0</string>
+		<key>CFBundlePackageType</key>
+		<string>dSYM</string>
+		<key>CFBundleSignature</key>
+		<string>????</string>
+		<key>CFBundleShortVersionString</key>
+		<string>1.0</string>
+		<key>CFBundleVersion</key>
+		<string>1</string>
+	</dict>
+</plist>

data/lib/gitignore_rb.rb

@@ -1,11 +1,20 @@
 require 'gitignore_rb/rust'
+require 'gitignore_rb/string_array'
 
+# Represents a `.gitignore` file and the operations one can perform on or with
+# them.
+#
+# This class will take the `.gitignore` file given, parse the rules contained
+# within it, and provides a set of functions to apply these rules in various
+# useful ways.
 class GitIgnoreRb
   def initialize(path)
     @path = path
   end
 
   def included_files
-    GitIgnoreRust::included_files(@path).to_a
+    GitIgnoreRust.included_files(@path).to_a
   end
 end
+
+GitIgnoreRb.new('/Users/nathan/repos/ihq/platform').included_files

data/lib/gitignore_rb/rust.rb

@@ -1,11 +1,14 @@
 require 'ffi'
 
+# Wraps up the FFI bindings to the Rust lib. This exposes the functions we have
+# in the Rust library itself and any requisite structs we use.
 module GitIgnoreRust
   extend FFI::Library
 
   ffi_lib File.expand_path(File.join(__dir__, '../../ext/gitignore_binding/target/release/libgitignore_binding.dylib'))
 
-  class GitIgnoreBindingArray < FFI::Struct
+  # Struct used to describe a Ruby Array of Strings being passed from Rust.
+  class StringArray < FFI::Struct
     layout :len, :size_t, # dynamic array layout
            :data, :pointer
 
@@ -14,5 +17,5 @@ module GitIgnoreRust
     end
   end
 
-  attach_function :included_files, [:string], GitIgnoreBindingArray.by_value
+  attach_function :included_files, [:string], StringArray.by_value
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitignore_rb
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Nathan Kleyn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-13 00:00:00.000000000 Z
+date: 2015-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -108,7 +108,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.1
-description: See https://github.com/nathankleyn/gitignore.rb for more information!
+description: A Ruby binding around gitignore.rs, a Rust implementation of .gitignore
+  file parsing and glob testing.
 email: nathan@nathankleyn.com
 executables: []
 extensions:
@@ -120,6 +121,21 @@ files:
 - ext/gitignore_binding/Cargo.toml
 - ext/gitignore_binding/Rakefile
 - ext/gitignore_binding/src/lib.rs
+- ext/gitignore_binding/target/debug/build/advapi32-sys-cfef7a1f30f1e5f6/build-script-build
+- ext/gitignore_binding/target/debug/build/advapi32-sys-cfef7a1f30f1e5f6/build_script_build.dSYM/Contents/Info.plist
+- ext/gitignore_binding/target/debug/build/advapi32-sys-cfef7a1f30f1e5f6/build_script_build.dSYM/Contents/Resources/DWARF/build_script_build
+- ext/gitignore_binding/target/debug/build/advapi32-sys-cfef7a1f30f1e5f6/output
+- ext/gitignore_binding/target/debug/deps/libadvapi32-cfef7a1f30f1e5f6.rlib
+- ext/gitignore_binding/target/debug/deps/libbuild-304afb6bdff23d72.rlib
+- ext/gitignore_binding/target/debug/deps/libgitignore-c7373b3d965f16d9.rlib
+- ext/gitignore_binding/target/debug/deps/libglob-25f28f4f852d8a9f.rlib
+- ext/gitignore_binding/target/debug/deps/liblibc-144c435538abd757.rlib
+- ext/gitignore_binding/target/debug/deps/librand-bdfcc55d3466feb3.rlib
+- ext/gitignore_binding/target/debug/deps/libtempdir-666eac814577b56f.rlib
+- ext/gitignore_binding/target/debug/deps/libwinapi-04bd24ca029a2f2c.rlib
+- ext/gitignore_binding/target/debug/libgitignore_binding.dylib
+- ext/gitignore_binding/target/debug/libgitignore_binding.dylib.dSYM/Contents/Info.plist
+- ext/gitignore_binding/target/debug/libgitignore_binding.dylib.dSYM/Contents/Resources/DWARF/libgitignore_binding.dylib
 - ext/gitignore_binding/target/release/build/advapi32-sys-cfef7a1f30f1e5f6/build-script-build
 - ext/gitignore_binding/target/release/build/advapi32-sys-cfef7a1f30f1e5f6/build_script_build.dSYM/Contents/Info.plist
 - ext/gitignore_binding/target/release/build/advapi32-sys-cfef7a1f30f1e5f6/build_script_build.dSYM/Contents/Resources/DWARF/build_script_build
@@ -158,6 +174,6 @@ rubyforge_project:
 rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
-summary: Implementation of .gitignore file parsing and glob testing. This library
-  is a Ruby binding around gitignore.rs.
+summary: A Ruby binding around gitignore.rs, a Rust implementation of .gitignore file
+  parsing and glob testing.
 test_files: []