rb-fsevent 0.9.2 → 0.9.3

data/README.rdoc

@@ -1,3 +1,6 @@
+{<img src="https://codeclimate.com/badge.png" />}[https://codeclimate.com/github/thibaudgg/rb-fsevent]
+
+
 = rb-fsevent
 
 Very simple & usable Mac OSX FSEvents API

data/ext/fsevent_watch/{fsevent_watch/TSICTString.c → TSICTString.c}

@@ -65,13 +65,13 @@ static inline TStringIRep* TSICTStringCreateWithDataOfTypeAndFormat(CFDataRef da
     if (format == kTSITStringFormatDefault) {
         format = TSICTStringGetDefaultFormat();
     }
-    
+
     TStringIRep* rep = calloc(1, sizeof(TStringIRep));
     rep->data = CFDataCreateCopy(kCFAllocatorDefault, data);
     rep->type = type;
     rep->format = format;
     rep->length = calloc(10, sizeof(char));
-    
+
     CFIndex len = CFDataGetLength(rep->data);
     if (snprintf(rep->length, 10, "%lu", len)) {
         return rep;
@@ -86,10 +86,10 @@ static inline CFDataRef TSICTStringCreateDataFromIntermediateRepresentation(TStr
     CFIndex len = CFDataGetLength(rep->data);
     CFMutableDataRef buffer = CFDataCreateMutableCopy(kCFAllocatorDefault, (len + 12), rep->data);
     UInt8* bufferBytes = CFDataGetMutableBytePtr(buffer);
-    
+
     size_t prefixLength = strlen(rep->length) + 1;
     CFDataReplaceBytes(buffer, BeginningRange, (const UInt8*)rep->length, (CFIndex)prefixLength);
-    
+
     if (rep->format == kTSITStringFormatTNetstring) {
         const UInt8 ftag = (UInt8)TNetstringTypes[rep->type];
         CFDataAppendBytes(buffer, &ftag, 1);
@@ -98,10 +98,10 @@ static inline CFDataRef TSICTStringCreateDataFromIntermediateRepresentation(TStr
         const UInt8 ftag = (UInt8)OTNetstringTypes[rep->type];
         bufferBytes[(prefixLength - 1)] = ftag;
     }
-    
+
     CFDataRef dataRep = CFDataCreateCopy(kCFAllocatorDefault, buffer);
     CFRelease(buffer);
-    
+
     return dataRep;
 }
 
@@ -116,21 +116,21 @@ static inline CFStringRef TSICTStringCreateStringFromIntermediateRepresentation(
 static inline CFDataRef TSICTStringCreateDataWithDataOfTypeAndFormat(CFDataRef data, TSITStringTag type, TSITStringFormat format)
 {
     CFRetain(data);
-    
+
     if (format == kTSITStringFormatDefault) {
         format = TSICTStringGetDefaultFormat();
     }
-    
+
     TStringIRep* rep = TSICTStringCreateWithDataOfTypeAndFormat(data, type, format);
     if (rep == NULL) {
         return NULL;
     }
-    
+
     CFDataRef result = TSICTStringCreateDataFromIntermediateRepresentation(rep);
-    
+
     TSICTStringDestroy(rep);
     CFRelease(data);
-    
+
     return result;
 }
 
@@ -139,15 +139,15 @@ static inline void TSICTStringAppendObjectToMutableDataWithFormat(CFTypeRef obje
     if (object == NULL) {
         object = kCFNull;
     }
-    
+
     CFRetain(object);
-    
+
     TStringIRep* objRep = TSICTStringCreateWithObjectAndFormat(object, format);
     CFDataRef objData = TSICTStringCreateDataFromIntermediateRepresentation(objRep);
     CFDataAppendBytes(buffer, (CFDataGetBytePtr(objData)), CFDataGetLength(objData));
     CFRelease(objData);
     TSICTStringDestroy(objRep);
-    
+
     CFRelease(object);
 }
 
@@ -156,7 +156,7 @@ static void ArrayBufferAppendCallback(const void* item, void* context)
     TStringCollectionCallbackContext* cx = (TStringCollectionCallbackContext*)context;
     CFMutableDataRef buffer = cx->buffer;
     TSITStringFormat format = cx->format;
-    
+
     TSICTStringAppendObjectToMutableDataWithFormat(item, buffer, format);
 }
 
@@ -165,7 +165,7 @@ static void DictionaryBufferAppendCallback(const void* key, const void* value, v
     TStringCollectionCallbackContext* cx = (TStringCollectionCallbackContext*)context;
     CFMutableDataRef buffer = cx->buffer;
     TSITStringFormat format = cx->format;
-    
+
     TSICTStringAppendObjectToMutableDataWithFormat(key, buffer, format);
     TSICTStringAppendObjectToMutableDataWithFormat(value, buffer, format);
 }
@@ -181,15 +181,15 @@ CFDataRef TSICTStringCreateRenderedDataFromObjectWithFormat(CFTypeRef object, TS
     if (object == NULL) {
         object = kCFNull;
     }
-    
+
     CFRetain(object);
-    
+
     TStringIRep* rep = TSICTStringCreateWithObjectAndFormat(object, format);
     CFDataRef data = TSICTStringCreateDataFromIntermediateRepresentation(rep);
-    
+
     TSICTStringDestroy(rep);
     CFRelease(object);
-    
+
     return data;
 }
 
@@ -203,15 +203,15 @@ CFStringRef TSICTStringCreateRenderedStringFromObjectWithFormat(CFTypeRef object
     if (object == NULL) {
         object = kCFNull;
     }
-    
+
     CFRetain(object);
-    
+
     TStringIRep* rep = TSICTStringCreateWithObjectAndFormat(object, format);
     CFStringRef string = TSICTStringCreateStringFromIntermediateRepresentation(rep);
-    
+
     TSICTStringDestroy(rep);
     CFRelease(object);
-    
+
     return string;
 }
 
@@ -222,10 +222,10 @@ TStringIRep* TSICTStringCreateWithObjectAndFormat(CFTypeRef object, TSITStringFo
         return TSICTStringCreateNullWithFormat(format);
     }
     CFRetain(object);
-    
+
     CFTypeID cfType = CFGetTypeID(object);
     TStringIRep* rep = NULL;
-    
+
     if (cfType == kCFDataTypeID) {
         rep = TSICTStringCreateWithDataOfTypeAndFormat(object, kTSITStringTagString, format);
     } else if (cfType == kCFStringTypeID) {
@@ -247,7 +247,7 @@ TStringIRep* TSICTStringCreateWithObjectAndFormat(CFTypeRef object, TSITStringFo
     } else {
         rep = TSICTStringCreateInvalidWithFormat(format);
     }
-    
+
     CFRelease(object);
     return rep;
 }
@@ -268,7 +268,7 @@ TStringIRep* TSICTStringCreateWithNumberAndFormat(CFNumberRef number, TSITString
     TSITStringTag tag = kTSITStringTagNumber;
     CFDataRef data;
     CFNumberType numType = CFNumberGetType(number);
-    
+
     switch(numType) {
         case kCFNumberCharType:
         {
@@ -291,7 +291,7 @@ TStringIRep* TSICTStringCreateWithNumberAndFormat(CFNumberRef number, TSITString
             break;
         }
     }
-    
+
     if (tag == kTSITStringTagBool) {
         bool value;
         CFNumberGetValue(number, kCFNumberIntType, &value);
@@ -304,17 +304,17 @@ TStringIRep* TSICTStringCreateWithNumberAndFormat(CFNumberRef number, TSITString
         char buf[32];
         char *p, *e;
         double value;
-        
+
         CFNumberGetValue(number, numType, &value);
         sprintf(buf, "%#.15g", value);
-        
+
         e = buf + strlen(buf);
         p = e;
         while (p[-1]=='0' && ('0' <= p[-2] && p[-2] <= '9')) {
             p--;
         }
         memmove(p, e, strlen(e)+1);
-        
+
         data = CFDataCreate(kCFAllocatorDefault, (UInt8*)buf, (CFIndex)strlen(buf));
     } else {
         char buf[32];
@@ -323,7 +323,7 @@ TStringIRep* TSICTStringCreateWithNumberAndFormat(CFNumberRef number, TSITString
         sprintf(buf, "%lli", value);
         data = CFDataCreate(kCFAllocatorDefault, (UInt8*)buf, (CFIndex)strlen(buf));
     }
-    
+
     TStringIRep* rep = TSICTStringCreateWithDataOfTypeAndFormat(data, tag, format);
     CFRelease(data);
     CFRelease(number);
@@ -365,13 +365,13 @@ TStringIRep* TSICTStringCreateInvalidWithFormat(TSITStringFormat format)
 TStringIRep* TSICTStringCreateWithArrayAndFormat(CFArrayRef array, TSITStringFormat format)
 {
     CFRetain(array);
-    
+
     CFMutableDataRef buffer = CFDataCreateMutable(kCFAllocatorDefault, 0);
-    
+
     CFRange all = CFRangeMake(0, CFArrayGetCount(array));
     TStringCollectionCallbackContext cx = {buffer, format};
     CFArrayApplyFunction(array, all, ArrayBufferAppendCallback, &cx);
-    
+
     TStringIRep* rep = TSICTStringCreateWithDataOfTypeAndFormat(buffer, kTSITStringTagList, format);
     CFRelease(buffer);
     CFRelease(array);
@@ -381,12 +381,12 @@ TStringIRep* TSICTStringCreateWithArrayAndFormat(CFArrayRef array, TSITStringFor
 TStringIRep* TSICTStringCreateWithDictionaryAndFormat(CFDictionaryRef dictionary, TSITStringFormat format)
 {
     CFRetain(dictionary);
-    
+
     CFMutableDataRef buffer = CFDataCreateMutable(kCFAllocatorDefault, 0);
-    
+
     TStringCollectionCallbackContext cx = {buffer, format};
     CFDictionaryApplyFunction(dictionary, DictionaryBufferAppendCallback, &cx);
-    
+
     TStringIRep* rep = TSICTStringCreateWithDataOfTypeAndFormat(buffer, kTSITStringTagDict, format);
     CFRelease(buffer);
     CFRelease(dictionary);

data/ext/fsevent_watch/{fsevent_watch/cli.c → cli.c}

@@ -134,13 +134,11 @@ int cli_parser (int argc, const char** argv, struct cli_info* args_info)
     case 'V': // version
       cli_print_version();
       exit(EXIT_SUCCESS);
-      break;
     case 'h': // help
     case '?': // invalid option
     case ':': // missing argument
       cli_print_help();
       exit((c == 'h') ? EXIT_SUCCESS : EXIT_FAILURE);
-      break;
     }
   }
 

data/ext/fsevent_watch/{fsevent_watch/cli.h → cli.h}

@@ -1,6 +1,8 @@
 #ifndef CLI_H
 #define CLI_H
 
+#include "common.h"
+
 #ifndef CLI_NAME
 #define CLI_NAME "fsevent_watch"
 #endif /* CLI_NAME */
@@ -10,12 +12,9 @@
 #endif /* PROJECT_VERSION */
 
 #ifndef CLI_VERSION
-#define _str(s) #s
-#define _xstr(s) _str(s)
 #define CLI_VERSION _xstr(PROJECT_VERSION)
 #endif /* CLI_VERSION */
 
-#include "common.h"
 
 struct cli_info {
   UInt64 since_when_arg;

data/ext/fsevent_watch/{fsevent_watch/common.h → common.h}

@@ -9,21 +9,9 @@
 #include <CoreServices/CoreServices.h>
 #include <unistd.h>
 #include "compat.h"
+#include "defines.h"
 #include "TSICTString.h"
 
-#define COMPILED_AT __DATE__ " " __TIME__
-
-#define FLAG_CHECK(flags, flag) ((flags) & (flag))
-
-#define FPRINTF_FLAG_CHECK(flags, flag, msg, fd)  \
-  do {                                            \
-    if (FLAG_CHECK(flags, flag)) {                \
-      fprintf(fd, "%s", msg "\n"); } }            \
-  while (0)
-
-#define FLAG_CHECK_STDERR(flags, flag, msg)       \
-  FPRINTF_FLAG_CHECK(flags, flag, msg, stderr)
-
 enum FSEventWatchOutputFormat {
   kFSEventWatchOutputFormatClassic,
   kFSEventWatchOutputFormatNIW,

data/ext/fsevent_watch/defines.h

@@ -0,0 +1,40 @@
+#ifndef fsevent_watch_defines_h
+#define fsevent_watch_defines_h
+
+#define _str(s) #s
+#define _xstr(s) _str(s)
+
+#define COMPILED_AT __DATE__ " " __TIME__
+
+#if defined (__clang__)
+#define COMPILER "clang " __clang_version__
+#elif defined (__GNUC__)
+#define COMPILER "gcc " __VERSION__
+#else
+#define COMPILER "unknown"
+#endif
+
+#if defined(__ppc__)
+#define TARGET_CPU "ppc"
+#elif defined(__ppc64__)
+#define TARGET_CPU "ppc64"
+#elif defined(__i386__)
+#define TARGET_CPU "i386"
+#elif defined(__x86_64__)
+#define TARGET_CPU "x86_64"
+#else
+#define TARGET_CPU "unknown"
+#endif
+
+#define FLAG_CHECK(flags, flag) ((flags) & (flag))
+
+#define FPRINTF_FLAG_CHECK(flags, flag, msg, fd)  \
+  do {                                            \
+    if (FLAG_CHECK(flags, flag)) {                \
+      fprintf(fd, "%s", msg "\n"); } }            \
+  while (0)
+
+#define FLAG_CHECK_STDERR(flags, flag, msg)       \
+        FPRINTF_FLAG_CHECK(flags, flag, msg, stderr)
+
+#endif /* fsevent_watch_defines_h */

data/ext/fsevent_watch/{fsevent_watch/main.c → main.c}

@@ -47,48 +47,48 @@ static void append_path(const char* path)
 #endif
 
 #if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
-  
+
 #ifdef DEBUG
   fprintf(stderr, "compiled against 10.6+, using CFURLCreateFileReferenceURL\n");
 #endif
-  
+
   CFURLRef url = CFURLCreateFromFileSystemRepresentation(NULL, (const UInt8*)path, (CFIndex)strlen(path), false);
   CFURLRef placeholder = CFURLCopyAbsoluteURL(url);
   CFRelease(url);
-  
+
   CFMutableArrayRef imaginary = NULL;
-  
+
   // if we don't have an existing url, spin until we get to a parent that
   // does exist, saving any imaginary components for appending back later
   while(!CFURLResourceIsReachable(placeholder, NULL)) {
 #ifdef DEBUG
     fprintf(stderr, "path does not exist\n");
 #endif
-    
+
     CFStringRef child;
-    
+
     if (imaginary == NULL) {
       imaginary = CFArrayCreateMutable(NULL, 0, &kCFTypeArrayCallBacks);
     }
-    
+
     child = CFURLCopyLastPathComponent(placeholder);
     CFArrayInsertValueAtIndex(imaginary, 0, child);
     CFRelease(child);
-    
+
     url = CFURLCreateCopyDeletingLastPathComponent(NULL, placeholder);
     CFRelease(placeholder);
     placeholder = url;
-    
+
 #ifdef DEBUG
     fprintf(stderr, "parent: ");
     CFShow(placeholder);
 #endif
   }
-  
+
 #ifdef DEBUG
   fprintf(stderr, "path exists\n");
 #endif
-  
+
   // realpath() doesn't always return the correct case for a path, so this
   // is a funky workaround that converts a path into a (volId/inodeId) pair
   // and asks what the path should be for that. since it looks at the actual
@@ -98,12 +98,12 @@ static void append_path(const char* path)
   CFRelease(placeholder);
   placeholder = CFURLCreateFilePathURL(NULL, url, NULL);
   CFRelease(url);
-  
+
 #ifdef DEBUG
   fprintf(stderr, "path resolved to: ");
   CFShow(placeholder);
 #endif
-  
+
   // if we stripped off any imaginary path components, append them back on
   if (imaginary != NULL) {
     CFIndex count = CFArrayGetCount(imaginary);
@@ -119,30 +119,30 @@ static void append_path(const char* path)
     }
     CFRelease(imaginary);
   }
-  
+
 #ifdef DEBUG
   fprintf(stderr, "result: ");
   CFShow(placeholder);
 #endif
-  
+
   CFStringRef cfPath = CFURLCopyFileSystemPath(placeholder, kCFURLPOSIXPathStyle);
   CFArrayAppendValue(config.paths, cfPath);
   CFRelease(cfPath);
   CFRelease(placeholder);
-  
+
 #else
-  
+
 #ifdef DEBUG
   fprintf(stderr, "compiled against 10.5, using realpath()\n");
 #endif
-  
+
   char fullPath[PATH_MAX + 1];
-  
+
   if (realpath(path, fullPath) == NULL) {
 #ifdef DEBUG
     fprintf(stderr, "  realpath not directly resolvable from path\n");
 #endif
-    
+
     if (path[0] != '/') {
 #ifdef DEBUG
       fprintf(stderr, "  passed path is not absolute\n");
@@ -162,18 +162,18 @@ static void append_path(const char* path)
       strlcpy(fullPath, path, sizeof(fullPath));
     }
   }
-  
+
 #ifdef DEBUG
   fprintf(stderr, "  resolved path to: %s\n", fullPath);
   fprintf(stderr, "\n");
 #endif
-  
+
   CFStringRef pathRef = CFStringCreateWithCString(kCFAllocatorDefault,
                                                   fullPath,
                                                   kCFStringEncodingUTF8);
   CFArrayAppendValue(config.paths, pathRef);
   CFRelease(pathRef);
-  
+
 #endif
 }
 
@@ -249,7 +249,7 @@ static inline void parse_cli_settings(int argc, const char* argv[])
   fprintf(stderr, "config.latency      %f\n", config.latency);
 
 // STFU clang
-#if __LP64__
+#if defined(__LP64__)
   fprintf(stderr, "config.flags        %#.8x\n", config.flags);
 #else
   fprintf(stderr, "config.flags        %#.8lx\n", config.flags);
@@ -382,7 +382,7 @@ static void callback(__attribute__((unused)) FSEventStreamRef streamRef,
     fprintf(stderr, "  event ID: %llu\n", eventIds[i]);
 
 // STFU clang
-#if __LP64__
+#if defined(__LP64__)
     fprintf(stderr, "  event flags: %#.8x\n", eventFlags[i]);
 #else
     fprintf(stderr, "  event flags: %#.8lx\n", eventFlags[i]);